Ticket #2427: 2427.2.patch
File 2427.2.patch, 3.0 KB (added by , 10 years ago) |
---|
-
source/lib/sysdep/os/osx/dir_watch.cpp
1 /* Copyright (c) 201 3Wildfire Games1 /* Copyright (c) 2014 Wildfire Games 2 2 * 3 3 * Permission is hereby granted, free of charge, to any person obtaining 4 4 * a copy of this software and associated documentation files (the … … 188 188 { 189 189 if ( g_Stream == NULL ) 190 190 { 191 g_Stream = CreateEventStream( g_RootPaths ); 191 if (!g_RootPaths.empty()) 192 { 193 g_Stream = CreateEventStream( g_RootPaths ); 194 } 192 195 } 193 196 else 194 197 { -
source/simulation2/system/ParamNode.cpp
1 /* Copyright (C) 201 0Wildfire Games.1 /* Copyright (C) 2014 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify … … 109 109 std::vector<std::wstring> oldTokens; 110 110 std::vector<std::wstring> newTokens; 111 111 if (!replacing) // ignore the old tokens if replace="" was given 112 boost::algorithm::split(oldTokens, node.m_Value, boost::algorithm::is_space() );113 boost::algorithm::split(newTokens, value, boost::algorithm::is_space() );112 boost::algorithm::split(oldTokens, node.m_Value, boost::algorithm::is_space(), boost::algorithm::token_compress_on); 113 boost::algorithm::split(newTokens, value, boost::algorithm::is_space(), boost::algorithm::token_compress_on); 114 114 115 // Delete empty tokens116 oldTokens.erase(std::remove_if(oldTokens.begin(), oldTokens.end(), std::mem_fun_ref(&std::wstring::empty)), oldTokens.end());117 newTokens.erase(std::remove_if(newTokens.begin(), newTokens.end(), std::mem_fun_ref(&std::wstring::empty)), newTokens.end());118 119 115 // Merge the two lists 120 116 std::vector<std::wstring> tokens = oldTokens; 121 117 for (size_t i = 0; i < newTokens.size(); ++i) -
source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp
1 /* Copyright (C) 201 2Wildfire Games.1 /* Copyright (C) 2014 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify … … 144 144 int argc = 1; 145 145 char atlas[] = "atlas"; 146 146 char *argv[] = {atlas, NULL}; 147 wxEntry(argc, argv); 147 148 wxEntryStart(argc, argv); 149 wxTheApp->OnInit(); 150 151 wxTheApp->OnRun(); 152 wxTheApp->OnExit(); 153 154 wxEntryCleanup(); 155 148 156 #endif 149 157 } 150 158 … … 174 182 class AtlasDLLApp : public wxApp 175 183 { 176 184 public: 177 185 virtual bool OSXIsGUIApplication() 186 { 187 return false; 188 } 178 189 virtual bool OnInit() 179 190 { 180 191 // _CrtSetBreakAlloc(5632);