Merge branch 'master' into more-updates

src/qt/qt_main.cpp

@@ -114,7 +114,7 @@ main_thread_fn()
             }
         } else {
             /* Just so we dont overload the host OS. */
-            if (drawits < -1)
+            if (drawits < -1 || dopause)
                 std::this_thread::sleep_for(std::chrono::milliseconds(1));
             else
                 std::this_thread::yield();