Merge with 'Beep6581/dev'

2023-09-05 09:48:43 +02:00
parent d8c0b521ab 7c73da7723
commit 990e9c70a5
91 changed files with 1524 additions and 1157 deletions
--- a/rtgui/batchqueueentry.cc
+++ b/rtgui/batchqueueentry.cc
@@ -51,7 +51,7 @@ BatchQueueEntry::BatchQueueEntry (rtengine::ProcessingJob* pjob, const rtengine:

    thumbnail = thm;

-#if 1 //ndef WIN32
+#if 1 //ndef _WIN32
    // The BatchQueueEntryIdleHelper tracks if an entry has been deleted while it was sitting waiting for "idle"
    bqih = new BatchQueueEntryIdleHelper;
    bqih->bqentry = this;