Ticket #2427: 2427.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/simulation2/system/ParamNode.cpp

@@ -1 @@
-/* Copyright (C) 2010 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
@@ -113 +113 @@
                 boost::algorithm::split(newTokens, value, boost::algorithm::is_space());
 
                 // Delete empty tokens
-                oldTokens.erase(std::remove_if(oldTokens.begin(), oldTokens.end(), std::mem_fun_ref(&std::wstring::empty)), oldTokens.end());
-                newTokens.erase(std::remove_if(newTokens.begin(), newTokens.end(), std::mem_fun_ref(&std::wstring::empty)), newTokens.end());
+                std::vector<std::wstring>::iterator it = oldTokens.begin();
+                while (it != oldTokens.end()) {
+                    if (it->empty()) {
+                        it = oldTokens.erase(it);
+                    } else {
+                        ++it;
+                    }
+                }
+                
+                it = newTokens.begin();
+                while (it != newTokens.end()) {
+                    if (it->size() == 0) {
+                        it = newTokens.erase(it);
+                    } else {
+                        ++it;
+                    }
+                }
 
                 // Merge the two lists
                 std::vector<std::wstring> tokens = oldTokens;

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
@@ -51 +51 @@
 // in OnFatalException), and it's never especially useful, so don't use it.
 #define USE_WX_FATAL_EXCEPTION_REPORT 0
 
+
 // Shared memory allocation functions
 ATLASDLLIMPEXP void* ShareableMalloc(size_t n)
 {
@@ -144 +145 @@
     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 +183 @@
 class AtlasDLLApp : public wxApp
 {
 public:
-
+    virtual bool OSXIsGUIApplication()
+    {
+        return false;
+    }
     virtual bool OnInit()
     {
 //      _CrtSetBreakAlloc(5632);