1
0
miroir de https://github.com/arsenetar/dupeguru-cocoa.git synchronisé 2026-01-22 22:51:39 +00:00

Remove change in main.m and change submodule

- Remove changes in main.m, turns out we cannot actually catch it here.
Tried some other methods, however none worked.
- Change dupeguru submodule to a more "known" commit that did not have
partial work in it.

NOTE: Issue with picture mode appears to be from python 3.8+ changing to use
`spawn` as the method for multiprocessing.  While this is most likely better
we currently have issues when application is run normally (running from
run.py does not have issues). I am manually going to change to `fork`
instead since other methods did not work. This needs to be done on line
20 of matchblock.py.  Either need to
find a workaround or make a way to detect we are running with cocoa vs.
qt to make this switch.  Just on macos
would affect qt build which does not
need this change.
Cette révision appartient à :
2020-12-30 22:42:22 -06:00
Parent cf48ff3e54
révision c2ec4c3fe3
2 fichiers modifiés avec 4 ajouts et 12 suppressions

Voir le fichier

@@ -24,17 +24,9 @@ int main(int argc, char *argv[])
Py_SetPythonHome(wPythonPath);
Py_Initialize();
PyGILState_STATE gilState = PyGILState_Ensure();
/* This main gets called when multiprocessing spawns new threads. To
prevent this from opening more windows and not working correctly we
are just checking main here and not running the file. Should be able
to block on the python side of things but checking
__name__ == "__main__" did not seem to work in the one location I tried.
*/
if ([NSThread isMainThread]) {
FILE* fp = fopen([mainpy UTF8String], "r");
PyRun_SimpleFile(fp, [mainpy UTF8String]);
fclose(fp);
}
FILE* fp = fopen([mainpy UTF8String], "r");
PyRun_SimpleFile(fp, [mainpy UTF8String]);
fclose(fp);
PyGILState_Release(gilState);
if (gilState == PyGILState_LOCKED) {
PyThreadState_Swap(NULL);

Sous-module dupeguru mis-à-jour : c8cfa954d5...bf7d720126