Re-enable disabled NoMerge mods post bashed patch RRR

Under # 51 <--- RRR

Utumno:

SSS - self.mods_to_reselect to initData, add finally, trying to avoid
double refresh

doSave is True by default but should be specified explicitly

Co-authored-by: MrD <the.ubik@gmail.com>

Author: 2 people

Mopy/bash/basher/mod_links.py

@@ -918,7 +918,7 @@ def __init__(self, doCBash=False):
         self._text = _(u'Rebuild Patch (CBash *BETA*)...') if doCBash else _(
             u'Rebuild Patch...')
         self._help = _(u'Rebuild the Bashed Patch (CBash)') if doCBash else _(
-                    u'Rebuild the Bashed Patch')
+            u'Rebuild the Bashed Patch')
 
     def _initData(self, window, selection):
         super(_Mod_Patch_Update, self)._initData(window, selection)
@@ -927,6 +927,7 @@ def _initData(self, window, selection):
                                              'bash.patch.configs', {})
         thisIsCBash = configIsCBash(config)
         self.CBashMismatch = bool(thisIsCBash != self.doCBash)
+        self.mods_to_reselect = set()
 
     @balt.conversation
     def Execute(self):
@@ -935,6 +936,12 @@ def Execute(self):
             if not self._Execute(): return # prevent settings save
         except CancelError:
             return # prevent settings save
+        finally:
+            if self.mods_to_reselect: # may be cleared in PatchDialog#PatchExecute
+                for mod in self.mods_to_reselect:
+                    bosh.modInfos.lo_activate(mod, doSave=False)
+                bosh.modInfos.cached_lo_save_active()
+                self.window.RefreshUI(refreshSaves=True)
         # save data to disc in case of later improper shutdown leaving the
         # user guessing as to what options they built the patch with
         Link.Frame.SaveSettings()
@@ -1015,7 +1022,7 @@ def _Execute(self):
                 liststyle='tree',bOk=_(u'Continue Despite Errors')) as warning:
                    if not warning.askOkModal(): return
         with PatchDialog(self.window, self._selected_info, self.doCBash,
-                         importConfig) as patchDialog:
+                         importConfig, self.mods_to_reselect) as patchDialog:
             patchDialog.ShowModal()
         return self._selected_item
 
@@ -1073,7 +1080,10 @@ def _ask_deactivate_mergeable(self, active_prior_to_patch):
                                (noMerge, noMergeKey),
                                (deactivate, deactivateKey), ]:
                 deselect |= set(dialog.getChecked(key, lst))
-            if not deselect: return
+            if not deselect:
+                return
+            else:
+                self.mods_to_reselect = set(noMerge) & deselect
         with balt.BusyCursor():
             bosh.modInfos.lo_deactivate(deselect, doSave=True)
         self.window.RefreshUI(refreshSaves=True)

Mopy/bash/basher/patcher_dialog.py

@@ -53,7 +53,9 @@ class PatchDialog(balt.Dialog):
     :type patchers: list[basher.gui_patchers._PatcherPanel]
     """
 
-    def __init__(self,parent,patchInfo,doCBash=None,importConfig=True):
+    def __init__(self, parent, patchInfo, doCBash, importConfig,
+                 mods_to_reselect):
+        self.mods_to_reselect = mods_to_reselect
         self.parent = parent
         if (doCBash or doCBash is None) and bass.settings['bash.CBashEnabled']:
             doCBash = True
@@ -243,6 +245,11 @@ def PatchExecute(self): # TODO(ut): needs more work to reduce P/C differences to
             balt.WryeLog(self.parent, readme, patch_name.s,
                          log_icons=Resources.bashBlue)
             #--Select?
+            if self.mods_to_reselect:
+                for mod in self.mods_to_reselect:
+                    bosh.modInfos.lo_activate(mod, doSave=False)
+                self.mods_to_reselect.clear()
+                bosh.modInfos.cached_lo_save_active() ##: also done below duh
             count, message = 0, _(u'Activate %s?') % patch_name.s
             if load_order.cached_is_active(patch_name) or (
                         bass.inisettings['PromptActivateBashedPatch'] and