Windows: fix interactions between GUI and monitor.
This commit is contained in:
@@ -52,6 +52,7 @@ using std::vector;
|
||||
#include "x11mon.h"
|
||||
#endif
|
||||
#include "subtreelist.h"
|
||||
#include "idxstatus.h"
|
||||
|
||||
typedef unsigned long mttcast;
|
||||
|
||||
@@ -227,7 +228,6 @@ std::unique_lock<std::mutex> RclMonEventQueue::wait(int seconds, bool *top)
|
||||
return lock;
|
||||
}
|
||||
|
||||
int err;
|
||||
if (seconds > 0) {
|
||||
if (top)
|
||||
*top = false;
|
||||
@@ -576,6 +576,10 @@ bool startMonitor(RclConfig *conf, int opts)
|
||||
o_reexec->removeArg("-n");
|
||||
o_reexec->reexec();
|
||||
}
|
||||
if (!statusUpdater()->update(DbIxStatus::DBIXS_MONITOR, "")) {
|
||||
LOGDEB("Monitor returning because stop request (stop file)\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
LOGDEB("Rclmonprc: calling queue setTerminate\n");
|
||||
rclEQ.setTerminate();
|
||||
|
||||
Reference in New Issue
Block a user