Ticket #2427: 2427.2.patch

File 2427.2.patch, 3.0 KB (added by trompetin17, 10 years ago)

LAST ONE

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

     
    1 /* Copyright (c) 2013 Wildfire Games
     1/* Copyright (c) 2014 Wildfire Games
    22 *
    33 * Permission is hereby granted, free of charge, to any person obtaining
    44 * a copy of this software and associated documentation files (the
     
    188188{
    189189  if ( g_Stream == NULL )
    190190  {
    191     g_Stream = CreateEventStream( g_RootPaths );   
     191    if (!g_RootPaths.empty())
     192    {
     193      g_Stream = CreateEventStream( g_RootPaths );
     194    }
    192195  }
    193196  else
    194197  {
  • source/simulation2/system/ParamNode.cpp

     
    1 /* Copyright (C) 2010 Wildfire Games.
     1/* Copyright (C) 2014 Wildfire Games.
    22 * This file is part of 0 A.D.
    33 *
    44 * 0 A.D. is free software: you can redistribute it and/or modify
     
    109109                std::vector<std::wstring> oldTokens;
    110110                std::vector<std::wstring> newTokens;
    111111                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);
    114114
    115                 // Delete empty tokens
    116                 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 
    119115                // Merge the two lists
    120116                std::vector<std::wstring> tokens = oldTokens;
    121117                for (size_t i = 0; i < newTokens.size(); ++i)
  • source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp

     
    1 /* Copyright (C) 2012 Wildfire Games.
     1/* Copyright (C) 2014 Wildfire Games.
    22 * This file is part of 0 A.D.
    33 *
    44 * 0 A.D. is free software: you can redistribute it and/or modify
     
    144144    int argc = 1;
    145145    char atlas[] = "atlas";
    146146    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   
    148156#endif
    149157}
    150158
     
    174182class AtlasDLLApp : public wxApp
    175183{
    176184public:
    177 
     185    virtual bool OSXIsGUIApplication()
     186    {
     187        return false;
     188    }
    178189    virtual bool OnInit()
    179190    {
    180191//      _CrtSetBreakAlloc(5632);