Complain on startup if signer or decryption chains are inconsistent (#1520).

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

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 9c483213830affc100d8b2356505bdee7ccb27f0..1554c02f4541ff11374b06ceddc41afffc5c43f3 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -145,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);
@@ -210,7 +214,13 @@ public:
        TaskBarIcon ()
                : _status (0)
        {
+#ifdef DCPOMATIC_WINDOWS
                wxIcon icon (std_to_wx ("id"));
+#else
+               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+               wxIcon icon;
+               icon.CopyFromBitmap (bitmap);
+#endif
 
                SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
 
@@ -286,7 +296,7 @@ private:
                */
                Config::instance();
 
-#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX)
+#ifdef DCPOMATIC_LINUX
                StatusDialog* d = new StatusDialog ();
                d->Show ();
 #else
@@ -302,6 +312,8 @@ private:
                        splash->Destroy ();
                }
 
+               SetExitOnFrameDelete (false);
+
                return true;
        }