Browse Source

tags/2021-05-28
jules 17 years ago
parent
commit
336f5fa85c
2 changed files with 7 additions and 1 deletions
  1. +6
    -1
      src/juce_appframework/gui/components/windows/juce_ThreadWithProgressWindow.cpp
  2. +1
    -0
      src/juce_appframework/gui/components/windows/juce_ThreadWithProgressWindow.h

+ 6
- 1
src/juce_appframework/gui/components/windows/juce_ThreadWithProgressWindow.cpp View File

@@ -66,7 +66,10 @@ bool ThreadWithProgressWindow::runThread (const int priority)
startThread (priority);
startTimer (100);
alertWindow.setMessage (message);
{
const ScopedLock sl (messageLock);
alertWindow.setMessage (message);
}
const bool wasCancelled = alertWindow.runModalLoop() != 0;
@@ -84,6 +87,7 @@ void ThreadWithProgressWindow::setProgress (const double newProgress)
void ThreadWithProgressWindow::setStatusMessage (const String& newStatusMessage)
{
const ScopedLock sl (messageLock);
message = newStatusMessage;
}
@@ -97,6 +101,7 @@ void ThreadWithProgressWindow::timerCallback()
}
else
{
const ScopedLock sl (messageLock);
alertWindow.setMessage (message);
}
}


+ 1
- 0
src/juce_appframework/gui/components/windows/juce_ThreadWithProgressWindow.h View File

@@ -155,6 +155,7 @@ private:
double progress;
AlertWindow alertWindow;
String message;
CriticalSection messageLock;
const int timeOutMsWhenCancelling;
ThreadWithProgressWindow (const ThreadWithProgressWindow&);


Loading…
Cancel
Save