rescan checkbox on scan critical error msgbox

etotheipi · Feb 13, 2015 · 06a5c93 · 06a5c93
1 parent e6e1e90
commit 06a5c93
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ArmoryQt.py b/ArmoryQt.py
@@ -6308,7 +6308,13 @@ def handleCppNotification(self, action, args):
       elif action == WARNING_ACTION:
          #something went wrong on the C++ side, create a message box to report
          #it to the user
-         QMessageBox.critical(self, tr('BlockDataManager Warning'), \
+         if 'rescan' in args[0].lower() or 'rebuild' in args[0].lower():
+            result = MsgBoxWithDNAA(self, self, MSGBOX.Critical, 'BDM error!', args[0], 
+                                    "Rebuild and rescan on next start", dnaaStartChk=True)
+            if result[1] == True:
+               touchFile( os.path.join(ARMORY_HOME_DIR, 'rebuild.flag') )
+         else:   
+            QMessageBox.critical(self, tr('BlockDataManager Warning'), \
                               tr(args[0]), \
                               QMessageBox.Ok) 
          #this is a critical error reporting channel, should kill the app right

diff --git a/cppForSwig/BDM_mainthread.cpp b/cppForSwig/BDM_mainthread.cpp
@@ -360,8 +360,7 @@ try
 
       if (bdm->criticalError_.size())
       {
-         callback->run(BDMAction_ErrorMsg, &bdm->criticalError_);
-         throw runtime_error("BDM encountered a critical error");
+         throw runtime_error(bdm->criticalError_.c_str());
       }
 
       if(bdv->rescanZC_)