Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

Diff of /chitemDlg.cpp [0897cf] .. [e2d117] Maximize Restore

  Switch to side-by-side view

--- a/chitemDlg.cpp
+++ b/chitemDlg.cpp
@@ -3,7 +3,7 @@
 
 #include "stdafx.h"
 
-#define PRG_VERSION "7.4"
+#define PRG_VERSION "7.4a"
 
 #include <fcntl.h>
 #include <direct.h>
@@ -304,7 +304,7 @@
   m_panicbutton=new panicbutton;
   if(m_panicbutton)
   {
-    m_panicbutton->Create(IDD_PANICBUTTON,0);
+    m_panicbutton->Create(IDD_PANICBUTTON,this);
   }  
 }
 
@@ -592,6 +592,9 @@
   }
   idsmaps.RemoveAll();
 
+  darefs.Lookup("MASTAREA", tmploc);
+  Read2da(tmploc, masterareas);
+
   if(has_xpvar()) //iwd and iwd2
   {
     darefs.Lookup("EXPTABLE",tmploc);
@@ -2139,7 +2142,7 @@
   log("Checking bams...");
   pos=icons.GetStartPosition();
   start_panic();
-  while(pos && m_panicbutton)
+  while(pos && m_panicbutton && !m_panicbutton->abort)
   {
     ret=-1;
     icons.GetNextAssoc(pos,key,fileloc); //cannot skip original bams, there are too many
@@ -2456,6 +2459,8 @@
     return;
   }
   ret=check_statdesc();
+  ret|=check_spelldesc();
+  ret|=check_spawngroups();
   ret|=check_songlist();
   ret|=check_kits();
   //more checks