From b0c3dab3fc005cb9e4fbbae20c0d0a42f2ffd9b6 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Wed, 9 Mar 2011 14:08:44 +0000 Subject: [PATCH] Possible fix to webserver crash #1630 And return false now if no template is found. Otherwise it is not a fatal error. --- .svn-revision | 2 +- src/webserver/src/WebInterface.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.svn-revision b/.svn-revision index 5a62449a..10b63d4a 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -10485 +10486 diff --git a/src/webserver/src/WebInterface.cpp b/src/webserver/src/WebInterface.cpp index 9bad77e1..16804b72 100644 --- a/src/webserver/src/WebInterface.cpp +++ b/src/webserver/src/WebInterface.cpp @@ -599,15 +599,16 @@ bool CamulewebApp::OnCmdLineParsed(wxCmdLineParser& parser) LoadAmuleConfig(cfg); // do not process any other command-line parameters, use defaults instead + m_Verbose = false; + m_KeepQuiet = true; + m_LoadSettingsFromAmule = true; + if (!(m_TemplateOk = GetTemplateDir(m_TemplateName, m_TemplateDir))) { // no reason to run webserver without a template fprintf(stderr, "FATAL ERROR: Cannot find template: %s\n", (const char *)unicode2char(m_TemplateName)); - return true; + return false; } - m_Verbose = false; - m_KeepQuiet = true; - m_LoadSettingsFromAmule = true; return true; } -- 2.11.4.GIT