From 431fd3b8df0c7a09bed5264d1a5b2cfe12688d18 Mon Sep 17 00:00:00 2001
From: Marco Peereboom <marco@conformal.com>
Date: Wed, 12 Jan 2011 03:06:57 +0000
Subject: fix bug where during restart sometimes an extra tab got created.

---
 xxxterm.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'xxxterm.c')

diff --git a/xxxterm.c b/xxxterm.c
index 9cbc1e0..584303f 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -1556,8 +1556,9 @@ open_tabs(struct tab *t, struct karg *a)
 			if (feof(f) || ferror(f))
 				break;
 
-		if (uri && strlen(uri))
+		if (uri && strlen(uri)) {
 			create_new_tab(uri, NULL, 1);
+		}
 
 		free(uri);
 		uri = NULL;
@@ -1578,6 +1579,7 @@ restore_saved_tabs(void)
 	int		unlink_file = 0;
 	struct stat	sb;
 	struct karg	a;
+	int		rv = 0;
 
 	snprintf(file, sizeof file, "%s/%s",
 	    sessions_dir, XT_RESTART_TABS_FILE);
@@ -1588,12 +1590,12 @@ restore_saved_tabs(void)
 		a.s = XT_RESTART_TABS_FILE;
 	}
 
-	open_tabs(NULL, &a);
+	rv = open_tabs(NULL, &a);
 
 	if (unlink_file)
 		unlink(file);
 
-	return (1);
+	return (rv);
 }
 
 int
@@ -6322,7 +6324,7 @@ int
 main(int argc, char *argv[])
 {
 	struct stat		sb;
-	int			c, focus = 1, s, optn = 0;
+	int			c, s, optn = 0, focus = 1;
 	char			conf[PATH_MAX] = { '\0' };
 	char			file[PATH_MAX];
 	char			*env_proxy = NULL;
@@ -6546,10 +6548,10 @@ main(int argc, char *argv[])
 		restore_global_history();
 
 	if (!strcmp(named_session, XT_SAVED_TABS_FILE))
-		focus = restore_saved_tabs();
+		restore_saved_tabs();
 	else {
 		a.s = named_session;
-		focus = open_tabs(NULL, &a);
+		open_tabs(NULL, &a);
 	}
 
 	while (argc) {
@@ -6559,7 +6561,8 @@ main(int argc, char *argv[])
 		argc--;
 		argv++;
 	}
-	if (focus == 1)
+
+	if (TAILQ_EMPTY(&tabs))
 		create_new_tab(home, NULL, 1);
 
 	if (enable_socket)
-- 
cgit 1.4.1-2-gfad0

akeup-location?h=hlt&amp;id=29fe558a60c44805f925983ad6557825390fe4c9'>commit</a> <a href='/akkartik/mu/diff/arc/.traces/scheduler-wakeup-location?h=hlt&amp;id=29fe558a60c44805f925983ad6557825390fe4c9'>diff</a> <a href='/akkartik/mu/stats/arc/.traces/scheduler-wakeup-location?h=hlt'>stats</a></td><td class='form'><form class='right' method='get' action='/akkartik/mu/log/arc/.traces/scheduler-wakeup-location'>
<input type='hidden' name='h' value='hlt'/><input type='hidden' name='id' value='29fe558a60c44805f925983ad6557825390fe4c9'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/akkartik/mu/tree/?h=hlt&amp;id=29fe558a60c44805f925983ad6557825390fe4c9'>root</a>/<a href='/akkartik/mu/tree/arc?h=hlt&amp;id=29fe558a60c44805f925983ad6557825390fe4c9'>arc</a>/<a href='/akkartik/mu/tree/arc/.traces?h=hlt&amp;id=29fe558a60c44805f925983ad6557825390fe4c9'>.traces</a>/<a href='/akkartik/mu/tree/arc/.traces/scheduler-wakeup-location?h=hlt&amp;id=29fe558a60c44805f925983ad6557825390fe4c9'>scheduler-wakeup-location</a></div><div class='content'>blob: ef6db682d2687ffc42d881dcb9302909352b5625 (<a href='/akkartik/mu/plain/arc/.traces/scheduler-wakeup-location?h=hlt&amp;id=29fe558a60c44805f925983ad6557825390fe4c9'>plain</a>) (<a href='/akkartik/mu/blame/arc/.traces/scheduler-wakeup-location?h=hlt&amp;id=29fe558a60c44805f925983ad6557825390fe4c9'>blame</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
</pre></td>
<td class='lines'><pre><code>