diff --git a/clean_msvc.cmd b/clean_msvc.cmd
index 812c0af6ad..532eadc973 100644
--- a/clean_msvc.cmd
+++ b/clean_msvc.cmd
@@ -13,7 +13,6 @@
 
 del /s "%~dp0\*.ncb"
 del /s "%~dp0\*.obj"
-del /s "%~dp0\*.tmp"
 del /s "%~dp0\bin\*.ilk"
 del /s "%~dp0\*.idb"
 del /s "%~dp0\*.bsc"
@@ -22,3 +21,9 @@ del /s "%~dp0\*.pch"
 del /s "%~dp0\*.pdb"
 
 del /s /q "%~dp0\deps"
+
+:: These two can't be used currently because they match unwanted 4+ letter extensions, such
+:: as *.resx and *.tmpl ... wow, stupid. >_<
+
+:: del /s "%~dp0\*.tmp"
+:: del /s "%~dp0\*.res"
diff --git a/pcsx2/gui/ExecutorThread.cpp b/pcsx2/gui/ExecutorThread.cpp
index 2a3a1feeb8..be74dc5c59 100644
--- a/pcsx2/gui/ExecutorThread.cpp
+++ b/pcsx2/gui/ExecutorThread.cpp
@@ -162,7 +162,7 @@ void pxEvtHandler::PostEvent( SysExecEvent* evt )
 
 	ScopedLock synclock( m_mtx_pending );
 	
-	DbgCon.WriteLn( L"(%s) Posting event: %s  (queue count=%d)", GetEventHandlerName().c_str(), evt->GetEventName().c_str(), m_pendingEvents.size() );
+	//DbgCon.WriteLn( L"(%s) Posting event: %s  (queue count=%d)", GetEventHandlerName().c_str(), evt->GetEventName().c_str(), m_pendingEvents.size() );
 	
 	m_pendingEvents.push_back( evt );
 	if( m_pendingEvents.size() == 1)
diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp
index 4b47b1cac0..f5f258b22d 100644
--- a/pcsx2/gui/MainMenuClicks.cpp
+++ b/pcsx2/gui/MainMenuClicks.cpp
@@ -133,7 +133,13 @@ void MainEmuFrame::Menu_ResetAllSettings_Click(wxCommandEvent &event)
 //   (anything else) - Standard swap, no reset.  (hotswap!)
 wxWindowID SwapOrReset_Iso( wxWindow* owner, IScopedCoreThread& core_control, const wxString& isoFilename, const wxString& descpart1 )
 {
-	wxWindowID result = wxID_RESET;
+	wxWindowID result = wxID_CANCEL;
+
+	if( g_Conf->CdvdSource == CDVDsrc_Iso && isoFilename == g_Conf->CurrentIso )
+	{
+		core_control.AllowResume();
+		return result;
+	}
 
 	if( SysHasValidState() )
 	{
@@ -146,24 +152,26 @@ wxWindowID SwapOrReset_Iso( wxWindow* owner, IScopedCoreThread& core_control, co
 		);
 
 		result = pxIssueConfirmation( dialog, MsgButtons().Reset().Cancel().Custom(_("Swap Disc")), L"DragDrop:BootSwapIso" );
+		if( result == wxID_CANCEL )
+		{
+			core_control.AllowResume();
+			return result;
+		}
 	}
 
-	if( result != wxID_CANCEL )
+	SysUpdateIsoSrcFile( isoFilename );
+	if( result != wxID_RESET )
 	{
-		SysUpdateIsoSrcFile( isoFilename );
-		if( result != wxID_RESET )
-		{
-			Console.Indent().WriteLn( "HotSwapping to new ISO src image!" );
-			g_Conf->CdvdSource = CDVDsrc_Iso;
-			sMainFrame.UpdateIsoSrcSelection();
-			CoreThread.ChangeCdvdSource();
-			core_control.AllowResume();
-		}
-		else
-		{
-			core_control.DisallowResume();
-			sApp.SysExecute( CDVDsrc_Iso );
-		}
+		Console.Indent().WriteLn( "HotSwapping to new ISO src image!" );
+		g_Conf->CdvdSource = CDVDsrc_Iso;
+		sMainFrame.UpdateIsoSrcSelection();
+		CoreThread.ChangeCdvdSource();
+		core_control.AllowResume();
+	}
+	else
+	{
+		core_control.DisallowResume();
+		sApp.SysExecute( CDVDsrc_Iso );
 	}
 
 	return result;
@@ -188,23 +196,27 @@ wxWindowID SwapOrReset_CdvdSrc( wxWindow* owner, CDVD_SourceType newsrc )
 		);
 
 		result = pxIssueConfirmation( dialog, MsgButtons().Reset().Cancel().Custom(_("Swap Disc")), L"DragDrop:BootSwapIso" );
+
+		if( result == wxID_CANCEL )
+		{
+			core.AllowResume();
+			return result;
+		}
 	}
 
-	if( result != wxID_CANCEL )
+	CDVD_SourceType oldsrc = g_Conf->CdvdSource;
+	g_Conf->CdvdSource = newsrc;
+
+	if( result != wxID_RESET )
 	{
-		if( result != wxID_RESET )
-		{
-			Console.Indent().WriteLn( L"(CdvdSource) HotSwapping CDVD source types from %s to %s.", CDVD_SourceLabels[g_Conf->CdvdSource], CDVD_SourceLabels[newsrc] );
-			g_Conf->CdvdSource = newsrc;
-			CoreThread.ChangeCdvdSource();
-			core.AllowResume();
-		}
-		else
-		{
-			core.DisallowResume();
-			g_Conf->CdvdSource = newsrc;
-			sApp.SysExecute( newsrc );
-		}
+		Console.Indent().WriteLn( L"(CdvdSource) HotSwapping CDVD source types from %s to %s.", CDVD_SourceLabels[oldsrc], CDVD_SourceLabels[newsrc] );
+		CoreThread.ChangeCdvdSource();
+		core.AllowResume();
+	}
+	else
+	{
+		core.DisallowResume();
+		sApp.SysExecute( g_Conf->CdvdSource );
 	}
 
 	return result;
@@ -341,12 +353,13 @@ void MainEmuFrame::Menu_IsoBrowse_Click( wxCommandEvent &event )
 	ScopedCoreThreadPopup core;
 	wxString isofile;
 
-	if( !_DoSelectIsoBrowser(isofile) ||
-		(wxID_CANCEL == SwapOrReset_Iso(this, core, isofile, GetMsg_IsoImageChanged())) )
+	if( !_DoSelectIsoBrowser(isofile) )
 	{
 		core.AllowResume();
 		return;
 	}
+	
+	SwapOrReset_Iso(this, core, isofile, GetMsg_IsoImageChanged());
 }
 
 void MainEmuFrame::Menu_MultitapToggle_Click( wxCommandEvent& )