fix: Fusion Failed... name 'GUl' is not defined [11.1.0 regression] (#1495)
This commit is contained in:
1 parent
2d725a36ef
commit
a3f598c990
2 files changed
+4
-2
No files matched your search
@@ -442,7 +442,7 @@ class WorkerThread(QThread):
|
||||
if options.output is None:
|
||||
options.output = fusion_source_parent
|
||||
currentJobs.clear()
|
||||
job, fusion_cover_path = comic2ebook.makeFusion(bookDir)
|
||||
job, fusion_cover_path = comic2ebook.makeFusion(bookDir, self)
|
||||
currentJobs.append(job)
|
||||
MW.addMessage.emit(i18n.tr_arg(QCoreApplication.translate('KCCGUI', 'Created fusion at %1'), currentJobs[0]), 'info', False)
|
||||
except Exception as e:
|
||||
|
||||
@@ -1826,7 +1826,9 @@ def checkPre(source='KCC-'):
|
||||
if tempdir.startswith(source):
|
||||
rmtree(os.path.join(root, tempdir), True)
|
||||
|
||||
def makeFusion(sources: List[str]):
|
||||
def makeFusion(sources: List[str], qtgui=None):
|
||||
global GUI
|
||||
GUI = qtgui
|
||||
if len(sources) < 2:
|
||||
raise UserWarning(QCoreApplication.translate("KCCGUI", 'Fusion requires at least 2 sources. Did you forget to uncheck fusion?'))
|
||||
start = perf_counter()
|
||||
|
||||
Reference in new issue
Block a user