diff --git a/source/glest_game/global/metrics.cpp b/source/glest_game/global/metrics.cpp index 315a2fe11..393f7a4a8 100644 --- a/source/glest_game/global/metrics.cpp +++ b/source/glest_game/global/metrics.cpp @@ -57,7 +57,7 @@ namespace Glest { displayX = 800; displayY = 250; - displayW = 128; + displayW = 160; displayH = 480; } diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp index 54d61e560..83a69668b 100644 --- a/source/glest_map_editor/main.cpp +++ b/source/glest_map_editor/main.cpp @@ -457,7 +457,7 @@ namespace MapEditor { currentFile = fname; fileName = cutLastExt(extractFileFromDirectoryPath(fname.c_str())); fileDialog->SetPath(ToUnicode(fname)); - SetTitle(ToUnicode(winHeader + "; " + fname)); + SetTitle(ToUnicode(winHeader + " - " + fname)); } else SetTitle(ToUnicode(winHeader)); //setDirty(false); @@ -534,7 +534,7 @@ namespace MapEditor { //currentFile = fname; fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str())); fileDialog->SetPath(ToUnicode(currentFile)); - SetTitle(ToUnicode(winHeader + "; " + currentFile)); + SetTitle(ToUnicode(winHeader + " - " + currentFile)); } else SetTitle(ToUnicode(winHeader)); @@ -749,7 +749,7 @@ namespace MapEditor { fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str())); setDirty(false); setExtension(); - SetTitle(ToUnicode(winHeader + "; " + currentFile)); + SetTitle(ToUnicode(winHeader + " - " + currentFile)); } } catch (const string &e) { MsgDialog(this, ToUnicode(e), wxT("Exception"), wxOK | wxICON_ERROR).ShowModal(); @@ -824,7 +824,7 @@ namespace MapEditor { fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str())); setDirty(false); } - SetTitle(ToUnicode(winHeader + "; " + currentFile)); + SetTitle(ToUnicode(winHeader + " - " + currentFile)); } void MainWindow::onMenuFileExit(wxCommandEvent &event) { diff --git a/source/shared_lib/sources/platform/sdl/thread.cpp b/source/shared_lib/sources/platform/sdl/thread.cpp index 57fad0a60..c4b7cf39b 100644 --- a/source/shared_lib/sources/platform/sdl/thread.cpp +++ b/source/shared_lib/sources/platform/sdl/thread.cpp @@ -197,7 +197,10 @@ namespace Shared { //sleep(100); MutexSafeWrapper safeMutex(cleanupThreadMutex.get()); - cleanupThread.reset(0); + try { + cleanupThread.reset(0); + } catch (...) { + } //printf("In Thread::shutdownThreads Line: %d\n",__LINE__); } }