[OMPT-svn-commit] SF.net SVN: modplug:[1024] trunk/OpenMPT/mptrack

[<sag...@us...>]

Revision: 1024
          http://modplug.svn.sourceforge.net/modplug/?rev=1024&view=rev
Author:   saga-games
Date:     2011-09-06 12:23:23 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
[Imp] Added a try...catch block to module rescue code in unhandled exception filter, to prevent crashes in a crash (yo dawg)
[Fix] Add instrument confirmation in VST editor was broken since a few revisions ago.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
    trunk/OpenMPT/mptrack/ExceptionHandler.cpp

Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp	2011-09-05 14:39:30 UTC (rev 1023)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp	2011-09-06 12:23:23 UTC (rev 1024)
@@ -355,7 +355,7 @@
 				return false;
 
 			if(!m_pVstPlugin->isInstrument() || pModDoc->GetSoundFile()->GetModSpecifications().instrumentsMax == 0 ||
-				Reporting::Confirm(_T("You need to assign an instrument to this plugin before you can play notes from here.\nCreate a new instrument and assign this plugin to the instrument?"), false, false, this) == cnfYes)
+				Reporting::Confirm(_T("You need to assign an instrument to this plugin before you can play notes from here.\nCreate a new instrument and assign this plugin to the instrument?"), false, false, this) == cnfNo)
 			{
 				return false;
 			} else

Modified: trunk/OpenMPT/mptrack/ExceptionHandler.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ExceptionHandler.cpp	2011-09-05 14:39:30 UTC (rev 1023)
+++ trunk/OpenMPT/mptrack/ExceptionHandler.cpp	2011-09-06 12:23:23 UTC (rev 1024)
@@ -126,7 +126,14 @@
 				}
 				CString filename;
 				filename.Format("%s%d_%s.%s", baseRescuePath, ++numFiles, pModDoc->GetTitle(), pModDoc->GetSoundFile()->GetModSpecifications().fileExtension);
-				pModDoc->OnSaveDocument(filename);
+
+				try
+				{
+					pModDoc->OnSaveDocument(filename);
+				} catch(...)
+				{
+					continue;
+				}
 			}
 		}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.