make mussawindow initialize icons

this is also part of the useless try to stop qobject::moveToThread
warnings, but I decided it was a good idea for when qui/mussagl.cpp:main
isn't called because we were launched from a python extension.

diff --git a/qui/MussaWindow.cpp b/qui/MussaWindow.cpp
index 2342ee783fbfc75bb06673923f5eed26ef3c69eb..20c4a032e8dca3c8169188da8e860dcca98033d6 100644 (file)
--- a/qui/MussaWindow.cpp
+++ b/qui/MussaWindow.cpp
@@ -32,6 +32,14 @@ namespace fs = boost::filesystem;
 
 using namespace std;
 
+static void init_resources() {
+  static bool resources_loaded = false;
+  if (not resources_loaded) {
+    Q_INIT_RESOURCE(icons);
+    resources_loaded = true;
+  }
+}
+
 MussaWindow::MussaWindow(MussaRef analysis_, QWidget *parent) :
   QMainWindow(parent),
   analysis(analysis_),
@@ -60,6 +68,7 @@ MussaWindow::MussaWindow(MussaRef analysis_, QWidget *parent) :
   viewMussaAlignmentAction(0),
   manualAssistant(0)
 {
+  init_resources();
   setupWidgets();
   setupActions();
   setupAssistant();

diff --git a/qui/mussagl.cpp b/qui/mussagl.cpp
index 0795a9a6af213b004164dd5947ad8b0cfa07fc7b..a5f9b483eba1e2c98a35813fb3321203645831e4 100644 (file)
--- a/qui/mussagl.cpp
+++ b/qui/mussagl.cpp
@@ -51,7 +51,6 @@ int main(int argc, char **argv)
 #endif
   //opts.doc_dir = get_doc_dir();
   QApplication app(argc, argv, opts.useGUI);
-  Q_INIT_RESOURCE(icons);
 
   initialize_mussa(opts, argc, argv);
   if (opts.analysis == 0) {