Merge branch 'master' of gitorious.org:manaplus/manaplus

1 files changed, 11 insertions, 2 deletions

diff --git a/src/logger.h b/src/logger.h
index db618b275..54b44cc0e 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -58,12 +58,14 @@ class Logger
         /**
          * Sets whether the log should be written to standard output.
          */
-        void setLogToStandardOut(bool value) { mLogToStandardOut = value; }
+        void setLogToStandardOut(bool value)
+        { mLogToStandardOut = value; }
 
         /**
          * Enables logging to chat window
          */
-        void setChatWindow(ChatWindow *window) { mChatWindow = window; }
+        void setChatWindow(ChatWindow *window)
+        { mChatWindow = window; }
 
         /**
          * Enters a message in the log. The message will be timestamped.
@@ -98,6 +100,13 @@ class Logger
          */
         void error(const std::string &error_text) __attribute__ ((noreturn));
 
+        /**
+         * Log an error and quit. The error will pop-up on Windows and Mac, and
+         * will be printed to standard error everywhere else.
+         */
+        void safeError(const std::string &error_text)
+            __attribute__ ((noreturn));
+
     private:
         std::ofstream mLogFile;
         bool mLogToStandardOut;