diff -r e385d6da2b58 -r 5ebd9b059d6d src/select.h
--- src/select.h	Sat Oct 22 20:25:18 2011 +0100
+++ src/select.h	Tue Oct 25 14:52:19 2011 +0100
@@ -212,8 +212,8 @@
 			{
 				//we found one.
 				found=true;
+				b=&(bindingVec[ui]);
 				keyMask=b->getKeyFlags();
-				b=&(bindingVec[ui]);
 				continue;
 			}
 
@@ -221,8 +221,8 @@
 			//by a more complex keymask.
 			if( (keyMask & b->getKeyFlags() )== keyMask)
 			{
+				b=&(bindingVec[ui]);
 				keyMask=b->getKeyFlags();
-				b=&(bindingVec[ui]);
 			}
 		}
 	}
diff -r 594cdcc629c5 -r c2ac9c1d62ca src/filters/transform.cpp
--- src/filters/transform.cpp	Wed Oct 26 11:52:36 2011 +0100
+++ src/filters/transform.cpp	Fri Oct 28 21:54:30 2011 +0100
@@ -1575,9 +1575,9 @@
 int TransformFilter::getRefreshEmitMask() const
 {
 	if(showPrimitive)
+		return STREAM_TYPE_IONS | STREAM_TYPE_DRAW;
+	else
 		return STREAM_TYPE_IONS;
-	else
-		return STREAM_TYPE_IONS | STREAM_TYPE_DRAW;
 }
 
 
diff -r c2ac9c1d62ca -r 721a71f7880b src/3Depict.cpp
--- src/3Depict.cpp	Fri Oct 28 21:54:30 2011 +0100
+++ src/3Depict.cpp	Fri Oct 28 22:40:28 2011 +0100
@@ -4438,6 +4438,11 @@
 				fileSave->Enable(false);		
 			}
 		}
+		else
+		{
+			//No file to remove
+			filePath=wxT("");
+		}
 	}
 	else if(autosaveNamePIDMap.size() > 1)
 	{	
@@ -4453,7 +4458,7 @@
 		//but wxYES_NO and wxYES|wxNO does not (wxGTK).
 		wxSingleChoiceDialog *dlg= new wxSingleChoiceDialog(this,
 			wxTRANS("Multiple auto-save states were found; would you like to restore one?"),
-			wxTRANS("Restore auto-save?"),autoSaveChoices,NULL, wxOK|wxCANCEL|wxICON_QUESTION);
+			wxTRANS("Restore auto-save?"),autoSaveChoices,NULL, wxYES_NO|wxYES_DEFAULT|wxICON_QUESTION);
 
 		//Show the dialog to get a choice from the user
 		if(dlg->ShowModal()==wxID_YES)
@@ -4483,11 +4488,18 @@
 			}
 
 		}
+		else
+		{
+			//No file to delete
+			filePath=wxT("");
+		}
 
 	}
 	
-	
-	wxRemoveFile(filePath);	
+
+	//
+	if(filePath != wxT(""))	
+		wxRemoveFile(filePath);	
 	
 }
 wxSize MainWindowFrame::getNiceWindowSize() const
diff -r c2ac9c1d62ca -r 721a71f7880b src/cropPanel.cpp
--- src/cropPanel.cpp	Fri Oct 28 21:54:30 2011 +0100
+++ src/cropPanel.cpp	Fri Oct 28 22:40:28 2011 +0100
@@ -248,6 +248,8 @@
 				x=crop[CROP_LEFT];
 				y=1.0-crop[CROP_BOTTOM];
 				break;
+			default:
+				ASSERT(false);
 		}
 
 		tmpDist=(xMouse-x)*(xMouse-x) + (yMouse-y)*(yMouse-y);
@@ -570,6 +572,8 @@
 				xC=crop[CROP_LEFT];
 				yC=1.0-crop[CROP_BOTTOM];
 				break;
+			default:
+				ASSERT(false);
 		}
 
 		xC=xC*(float)w;
diff -r c2ac9c1d62ca -r 721a71f7880b src/voxels.h
--- src/voxels.h	Fri Oct 28 21:54:30 2011 +0100
+++ src/voxels.h	Fri Oct 28 22:40:28 2011 +0100
@@ -1349,7 +1349,7 @@
 	kernel.getSize(x,y,z);
 	half=x/2;
 	//Kernel needs to be cubic
-	ASSERT(x==y && y == z && !(z%2));
+	ASSERT(x==y && y == z && (z%2));
 
 	if(boundMode!=BOUND_CLIP)
 	{
diff -r 4e5ab540702a -r 800d4f0dc5e3 src/prefDialog.cpp
--- src/prefDialog.cpp	Fri Oct 28 23:20:06 2011 +0100
+++ src/prefDialog.cpp	Sat Oct 29 00:10:49 2011 +0100
@@ -172,9 +172,9 @@
 
 	//Transfer the movement rates from class  to the slider
 	ASSERT(mouseZoomRatePercent  >=sliderCamZoomRate->GetMin() && 
-			mouseZoomRatePercent < sliderCamZoomRate->GetMax());
+			mouseZoomRatePercent <=sliderCamZoomRate->GetMax());
 	ASSERT(mouseMoveRatePercent  >=sliderCamMoveRate->GetMin() && 
-			mouseMoveRatePercent < sliderCamMoveRate->GetMax());
+			mouseMoveRatePercent <=sliderCamMoveRate->GetMax());
 
 
 	sliderCamZoomRate->SetValue(mouseZoomRatePercent);