Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

[dcpomatic.git] / src / tools / dcpomatic_server.cc

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 727983b5ac2ba41992e220950f15f0c53827e6b8..8c6abed5babbbe19bfaca78c3313e6c02cbd48ed 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -60,6 +60,9 @@ static unsigned int const log_lines = 32;
 class ServerLog : public Log, public Signaller
 {
 public:
+       ServerLog ()
+               : _fps (0)
+       {}
 
        string get () const {
                string a;
@@ -142,7 +145,11 @@ public:
                : wxDialog (
                        0, wxID_ANY, _("DCP-o-matic Encode Server"),
                        wxDefaultPosition, wxDefaultSize,
+#ifdef DCPOMATIC_OSX
+                       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxSTAY_ON_TOP
+#else
                        wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
+#endif
                        )
        {
                wxFlexGridSizer* state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
@@ -251,7 +258,6 @@ class App : public wxApp, public ExceptionStore
 public:
        App ()
                : wxApp ()
-               , _thread (0)
                , _icon (0)
        {}
 
@@ -266,6 +272,7 @@ private:
                wxInitAllImageHandlers ();
 
                server_log.reset (new ServerLog);
+               server_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
                dcpomatic_log = server_log;
 
                Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
@@ -294,7 +301,7 @@ private:
 #else
                _icon = new TaskBarIcon;
 #endif
-               _thread = new thread (bind (&App::main_thread, this));
+               _thread = thread (bind (&App::main_thread, this));
 
                Bind (wxEVT_TIMER, boost::bind (&App::check, this));
                _timer.reset (new wxTimer (this));
@@ -304,6 +311,8 @@ private:
                        splash->Destroy ();
                }
 
+               SetExitOnFrameDelete (false);
+
                return true;
        }
 
@@ -349,7 +358,7 @@ private:
                message_dialog (0, std_to_wx (m));
        }
 
-       boost::thread* _thread;
+       boost::thread _thread;
        TaskBarIcon* _icon;
        shared_ptr<wxTimer> _timer;
 };