Fix #316

source/gx/terminix/application.d

@@ -287,7 +287,12 @@ private:
                 if (terminalUUID.length == 0) {
                     AppWindow window = getActiveAppWindow();
                     if (window !is null) terminalUUID = window.getActiveTerminalUUID();   
-                } 
+                }
+                //If workingDir is not set, override it with cwd so that it takes priority for
+                //executing actions below
+                if (cp.workingDir.length == 0) {
+                    cp.workingDir = cp.cwd;
+                }
                 executeAction(terminalUUID, cp.action);
                 return cp.exitCode;
             }
@@ -302,29 +307,37 @@ private:
                 string instanceAction = gsGeneral.getString(SETTINGS_NEW_INSTANCE_MODE_KEY);
                 //If focus-window command line parameter was passed, override setting
                 if (cp.focusWindow) instanceAction = SETTINGS_NEW_INSTANCE_MODE_VALUES[4];
-                //If workingDir is not set, override it with cwd so that it takes priority for
-                //executing actions below
-                if (cp.workingDir.length ==0) {
-                    cp.workingDir = cp.cwd;
-                }
                 switch (instanceAction) {
                     //New Session
                     case SETTINGS_NEW_INSTANCE_MODE_VALUES[1]:
                         aw.present();
-                        aw.createSession();
-                        return cp.exitCode;
-                    //Split Right
-                    case SETTINGS_NEW_INSTANCE_MODE_VALUES[2]:
-                        aw.present();
-                        executeAction(aw.getActiveTerminalUUID, "terminal-split-right");
+                        if (cp.session.length > 0) {
+                            // This will use global override and load sessions
+                            aw.initialize();
+                        } else {
+                            aw.createSession();
+                        }
                         return cp.exitCode;
-                    //Split Down
-                    case SETTINGS_NEW_INSTANCE_MODE_VALUES[3]:
+                    //Split Right, Split Down
+                    case SETTINGS_NEW_INSTANCE_MODE_VALUES[2], SETTINGS_NEW_INSTANCE_MODE_VALUES[3]:
+                        if (cp.session.length > 0) break;
                         aw.present();
-                        executeAction(aw.getActiveTerminalUUID, "terminal-split-down");
+                        //If workingDir is not set, override it with cwd so that it takes priority for
+                        //executing actions below
+                        if (cp.workingDir.length == 0) {
+                            cp.workingDir = cp.cwd;
+                        }
+                        if (instanceAction == SETTINGS_NEW_INSTANCE_MODE_VALUES[2])
+                            executeAction(aw.getActiveTerminalUUID, "terminal-split-right");
+                        else
+                            executeAction(aw.getActiveTerminalUUID, "terminal-split-down");
                         return cp.exitCode;
                     //Focus Window
                     case SETTINGS_NEW_INSTANCE_MODE_VALUES[4]:
+                        if (cp.session.length > 0) {
+                            // This will use global override and load sessions
+                            aw.initialize();
+                        }
                         aw.present();
                         return cp.exitCode;
                     default:

source/gx/terminix/appwindow.d

@@ -865,7 +865,7 @@ public:
     void initialize(Session session) {
         addSession(session);
     }
-
+    
     /**
      * Activates the specified sessionUUID
      */

source/gx/terminix/terminal/terminal.d

@@ -1382,6 +1382,7 @@ private:
         CommandParameters overrides = terminix.getGlobalOverrides();
         //If cwd is set in overrides use that if an explicit working dir wasn't passed as a parameter
         if (workingDir.length == 0 && overrides.cwd.length > 0) {
+            trace("Using cwd provided");
             workingDir = overrides.cwd;
         }
         if (overrides.workingDir.length > 0) {