From 9db2a589c582e0429eae3c269b2918ca0217b2a7 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Fri, 13 Jul 2007 11:07:35 +0000
Subject: [PATCH] If -i, --new-instance options are passed, disable loading &
 saving of session files.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1699 ea778897-0a13-0410-b9d1-a72fbfd435f5
---
 ChangeLog  | 3 +++
 src/main.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9fa51453..dee8f86a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
  * src/treeviews.c:
    Prevent warning when closing files when Geany is busy (e.g. pressing
    Ctrl-W when opening files).
+ * src/main.c:
+   If -i, --new-instance options are passed, disable loading & saving of
+   session files.
 
 
 2007-07-12  Enrico Tröger  <enrico.troeger@uvena.de>
diff --git a/src/main.c b/src/main.c
index 8c4a8e6a..14992d37 100644
--- a/src/main.c
+++ b/src/main.c
@@ -513,6 +513,8 @@ static void parse_command_line_options(gint *argc, gchar ***argv)
 
 #ifdef HAVE_SOCKET
 	socket_info.ignore_socket = ignore_socket;
+	if (ignore_socket)
+		cl_options.load_session = FALSE;
 #endif
 #ifdef HAVE_VTE
 	vte_info.lib_vte = lib_vte;