Add closeMudlet() to the Lua api. (Mudlet#917)

Saves and closes all profiles from within Mudlet and closes the application.
ly19811105 · Apr 17, 2017 · 07e9c43 · 07e9c43
1 parent de64759
commit 07e9c43
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/src/TLuaInterpreter.cpp b/src/TLuaInterpreter.cpp
@@ -2468,6 +2468,12 @@ int TLuaInterpreter::killTrigger( lua_State *L )
     return 1;
 }
 
+int TLuaInterpreter::closeMudlet(lua_State* L)
+{
+    mudlet::self()->forceClose();
+    return 0;
+}
+
 // openUserWindow( session, string window_name )
 int TLuaInterpreter::openUserWindow( lua_State *L )
 {
@@ -13081,6 +13087,7 @@ void TLuaInterpreter::initLuaGlobals()
     lua_register( pGlobalLua, "tempTimer", TLuaInterpreter::tempTimer );
     lua_register( pGlobalLua, "tempTrigger", TLuaInterpreter::tempTrigger );
     lua_register( pGlobalLua, "tempRegexTrigger", TLuaInterpreter::tempRegexTrigger );
+    lua_register( pGlobalLua, "closeMudlet", TLuaInterpreter::closeMudlet);
     lua_register( pGlobalLua, "openUserWindow", TLuaInterpreter::openUserWindow );
     lua_register( pGlobalLua, "echoUserWindow", TLuaInterpreter::echoUserWindow );
     lua_register( pGlobalLua, "enableTimer", TLuaInterpreter::enableTimer );

diff --git a/src/TLuaInterpreter.h b/src/TLuaInterpreter.h
@@ -236,6 +236,7 @@ class TLuaInterpreter : public QThread
     static int setFgColor( lua_State * L );
     static int setBgColor( lua_State * L );
     static int tempTimer( lua_State * L );
+    static int closeMudlet( lua_State* L );
     static int openUserWindow( lua_State * L );
     static int echoUserWindow( lua_State * L );
     static int clearUserWindow( lua_State * L );

diff --git a/src/mudlet.cpp b/src/mudlet.cpp
@@ -1726,6 +1726,14 @@ void mudlet::closeEvent(QCloseEvent *event)
     qApp->quit();
 }
 
+void mudlet::forceClose()
+{
+    for (auto console : mConsoleMap) {
+        console->mUserAgreedToCloseConsole = true;
+    }
+
+    close();
+}
 
 void mudlet::readSettings()
 {

diff --git a/src/mudlet.h b/src/mudlet.h
@@ -82,6 +82,7 @@ class mudlet : public QMainWindow, public Ui::MainWindow
    Host *                        getActiveHost();
    void                          registerTimer( TTimer *, QTimer * );
    void                          unregisterTimer( QTimer * );
+   void                          forceClose();
    bool                          openWindow( Host *, const QString & );
    bool                          createMiniConsole( Host *, const QString &, int, int, int, int );
    bool                          createLabel( Host *, const QString &, int, int, int, int, bool );