X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/301b66db61ce7434db602b228ffb4f087f29a368..f317611e5572e4292e3ee88f6956a97fcd794089:/window.c

diff --git a/window.c b/window.c
index bb436369..74339b45 100644
--- a/window.c
+++ b/window.c
@@ -14,6 +14,7 @@
 
 #define PUTTY_DO_GLOBALS		       /* actually _define_ globals */
 #include "putty.h"
+#include "winstuff.h"
 #include "storage.h"
 #include "win_res.h"
 
@@ -107,7 +108,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
     MSG msg;
     int guess_width, guess_height;
 
-    putty_inst = inst;
+    hinst = inst;
     flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
 
     winsock_ver = MAKEWORD(1, 1);
@@ -197,6 +198,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
 	 * An initial @ means to activate a saved session.
 	 */
 	if (*p == '@') {
+	    int i = strlen(p);
+	    while (i > 1 && isspace(p[i-1]))
+		i--;
+	    p[i] = '\0';
 	    do_defaults (p+1, &cfg);
 	    if (!*cfg.host && !do_config()) {
 		WSACleanup();