[springlobby] 01/03: New upstream version 0.263+dfsg
Markus Koschany
apo at moszumanska.debian.org
Fri Jan 12 15:13:54 UTC 2018
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository springlobby.
commit 293698f941834656d711c4887c67cf62ebc82e77
Author: Markus Koschany <apo at debian.org>
Date: Fri Jan 12 14:39:17 2018 +0000
New upstream version 0.263+dfsg
---
ChangeLog | 3 +++
VERSION | 2 +-
springlobby_config.h | 2 +-
src/downloader/lib/src/lsl/lslunitsync/springbundle.cpp | 1 +
src/springlobbyapp.cpp | 11 ++++++++---
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 60acefd..3364dea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
ChangeLog of Springlobby
+## 0.263
+ - more verbose logging to track down crashes
+
## 0.262
- fix demo replay (spring engine not found)
- fix "autolaunch game"
diff --git a/VERSION b/VERSION
index f22b3ff..b1b695c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.262
+0.263
diff --git a/springlobby_config.h b/springlobby_config.h
index 1772116..69dfa26 100644
--- a/springlobby_config.h
+++ b/springlobby_config.h
@@ -6,6 +6,6 @@
#undef VERSION
/* the git tag / commit we build from */
-#define VERSION "0.262"
+#define VERSION "0.263"
#endif /* SPRINGLOBBY_HEADERGUARD_CONFIG_H */
diff --git a/src/downloader/lib/src/lsl/lslunitsync/springbundle.cpp b/src/downloader/lib/src/lsl/lslunitsync/springbundle.cpp
index de4ccf9..55707bc 100644
--- a/src/downloader/lib/src/lsl/lslunitsync/springbundle.cpp
+++ b/src/downloader/lib/src/lsl/lslunitsync/springbundle.cpp
@@ -18,6 +18,7 @@ bool SpringBundle::GetBundleVersion()
if (!Util::FileExists(unitsync)) {
return false;
}
+ LslInfo("Trying to load %s", unitsync.c_str());
void* temphandle = _LoadLibrary(unitsync);
if (temphandle == nullptr)
return false;
diff --git a/src/springlobbyapp.cpp b/src/springlobbyapp.cpp
index bd12892..4d1a3cc 100644
--- a/src/springlobbyapp.cpp
+++ b/src/springlobbyapp.cpp
@@ -153,10 +153,12 @@ bool SpringLobbyApp::OnInit()
m_translationhelper = new wxTranslationHelper(GetAppName().Lower(), getLocalePath());
- const wxString configdir = TowxString(SlPaths::GetConfigfileDir());
- SlPaths::mkDir(STD_STRING((configdir)));
+ const std::string configdir = SlPaths::GetConfigfileDir();
+ wxLogMessage("Config dir: %s", configdir.c_str());
+ SlPaths::mkDir(configdir);
if (cfg().ReadBool(_T("/ResetLayout"))) {
+ wxLogMessage("Resetting Layout...");
//we do this early on and reset the config var a little later so we can save a def. perps once mw is created
sett().RemoveLayouts();
cfg().Write(_T( "/ResetLayout" ), false);
@@ -171,18 +173,21 @@ bool SpringLobbyApp::OnInit()
SlPaths::SetSpringBinary(SlPaths::GetCurrentUsedSpringIndex(), SlPaths::GetSpringBinary());
SlPaths::SetUnitSync(SlPaths::GetCurrentUsedSpringIndex(), SlPaths::GetUnitSync());
}
-
+ wxLogMessage("Configuring Unitsync...");
// configure unitsync paths before trying to load
SlPaths::ReconfigureUnitsync();
sett().Setup(m_translationhelper);
notificationManager(); //needs to be initialized too
+
+ wxLogMessage("Showing Main Window");
ui().ShowMainWindow();
SetTopWindow(&ui().mw());
ui().mw().SetLogWin(loggerwin);
//unitsync first load, FIXME move to a thread!
+ wxLogMessage("Refreshing Spring Version List...");
SlPaths::RefreshSpringVersionList();
if (LSL::usync().ReloadUnitSyncLib()) {
GlobalEventManager::Instance()->Send(GlobalEventManager::OnUnitsyncReloaded);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/springlobby.git
More information about the Pkg-games-commits
mailing list