Merge branch '0.5.0.x' into 0.5.x

This commit is contained in:
Luke Dashjr
2012-04-06 17:45:20 -04:00

View File

@@ -8,6 +8,7 @@
#include "headers.h"
#include "init.h"
#include "util.h"
#include <QApplication>
#include <QMessageBox>
@@ -45,7 +46,7 @@ int ThreadSafeMessageBox(const std::string& message, const std::string& caption,
if (modal)
while (!guiref)
sleep(1);
Sleep(1000);
// Message from network thread
if(guiref)