Merge branch 'master' into genete_core_review

[synfig.git] / synfig-studio / src / gui / app.cpp

diff --git a/synfig-studio/src/gui/app.cpp b/synfig-studio/src/gui/app.cpp
index b50b120..207fcc5 100644 (file)
--- a/synfig-studio/src/gui/app.cpp
+++ b/synfig-studio/src/gui/app.cpp
@@ -271,8 +271,12 @@ std::list< etl::handle< studio::Module > > module_list_;
 
 bool studio::App::use_colorspace_gamma=true;
 #ifdef SINGLE_THREADED
-bool studio::App::single_threaded=false;
-#endif
+       #ifdef  WIN32
+       bool studio::App::single_threaded=true;
+       #else
+       bool studio::App::single_threaded=false;
+       #endif // WIN32
+#endif  // SINGLE THREADED
 bool studio::App::restrict_radius_ducks=false;
 bool studio::App::resize_imported_images=false;
 String studio::App::custom_filename_prefix(DEFAULT_FILENAME_PREFIX);
@@ -1313,10 +1317,9 @@ App::App(int *argc, char ***argv):
                if(auto_recover->recovery_needed())
                {
                        splash_screen.hide();
-                       if (get_ui_interface()->confirmation("Crash Recovery",
+                       if (get_ui_interface()->confirmation(_("Crash Recovery"),
                                        _("Auto recovery file found"),
-                                       _("Synfig Studio seems to have crashed\n"
-                                         "before you could save all your files.\n"
+                                       _("Synfig Studio seems to have crashed before you could save all your files. "
                                          "Recover unsaved changes?"),
                                        _("Recover"), _("Ignore"))
                                == synfigapp::UIInterface::RESPONSE_OK)
@@ -1328,11 +1331,10 @@ App::App(int *argc, char ***argv):
                                        else
                                                get_ui_interface()->error(_("Unable to recover from previous crash"));
                                else
-                                       get_ui_interface()->error(
-                                               _("Synfig Studio has attempted to recover\n"
-                                                 "from a previous crash. The files that it has\n"
-                                                 "recovered are NOT YET SAVED. It would be a good\n"
-                                                 "idea to review them and save them now."));
+                                       dialog_warning_blocking(_("Warning"),
+                                               _("Synfig Studio has attempted to recover from a previous crash. "
+                                               "The files that it has recovered are NOT YET SAVED. It would be a "
+                                               "good idea to review them and save them now."));
 
                                if (number_recovered)
                                        opened_any = true;