Ticket #2427: 2427.3.patch

source/lib/sysdep/os/osx/dir_watch.cpp

@@ -1 @@
-/* Copyright (c) 2013 Wildfire Games
+/* Copyright (c) 2014 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -188 +188 @@
 {
   if ( g_Stream == NULL )
   {
-    g_Stream = CreateEventStream( g_RootPaths );    
+    if (!g_RootPaths.empty())
+    {
+      g_Stream = CreateEventStream( g_RootPaths );
+    }
   }
   else
   {

source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp

@@ -1 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2014 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -144 +144 @@
     int argc = 1;
     char atlas[] = "atlas";
     char *argv[] = {atlas, NULL};
-    wxEntry(argc, argv);
+    
+    wxEntryStart(argc, argv);
+    wxTheApp->OnInit();
+    
+    wxTheApp->OnRun();
+    wxTheApp->OnExit();
+    
+    wxEntryCleanup();
+    
 #endif
 }
 
@@ -174 +182 @@
 class AtlasDLLApp : public wxApp
 {
 public:
-
+    virtual bool OSXIsGUIApplication()
+    {
+        return false;
+    }
     virtual bool OnInit()
     {
 //      _CrtSetBreakAlloc(5632);