From 271de3c9de773a42ecdaaa9ef013f7897e001d82 Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Wed, 6 Jun 2001 22:22:45 +0000
Subject: [PATCH] Fixed a bug with the application number showing up even with
 the first instance of the application.

---
 src/application.c | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/application.c b/src/application.c
index d3acb0d8..e7ef7dfb 100644
--- a/src/application.c
+++ b/src/application.c
@@ -301,25 +301,6 @@ wApplicationCreate(WScreen *scr, Window main_window)
 #endif /* USER_MENU */
 
 
-    {
-	WApplication *tmp = scr->wapp_list;
-	
-	wapp->next = NULL;
-	wapp->prev = NULL;
-
-	/* append to app list */
-	if (!tmp) {
-	    scr->wapp_list = wapp;
-	} else {
-	    while (tmp->next) {
-		tmp = tmp->next;
-	    }
-	    tmp->next = wapp;
-	    wapp->prev = tmp;
-	}
-    }
-    
-    
     /*
      * Set application wide attributes from the leader.
      */
@@ -435,7 +416,8 @@ wApplicationCreate(WScreen *scr, Window main_window)
 
     /* set the application instance index */
     {
-	WApplication *list = scr->wapp_list;
+        WApplication *list = scr->wapp_list;
+        WApplication *prev = NULL;
 	int index = 0;
 	WWindow *wwin = wapp->main_window_desc;
 /*
@@ -455,15 +437,28 @@ wApplicationCreate(WScreen *scr, Window main_window)
 		    index++;
 		    
 		    /* restart list traversal */
-		    list = scr->wapp_list;
+                    list = scr->wapp_list;
+                    prev = NULL;
 		    continue;
 		}
 	    }
-	    
+
+            prev = list;
 	    list = list->next;
 	}
 	
-	wapp->index = index;
+        wapp->index = index;
+
+	wapp->next = NULL;
+	wapp->prev = NULL;
+
+	/* append to app list */
+	if (!prev) {
+	    scr->wapp_list = wapp;
+	} else {
+	    prev->next = wapp;
+	    wapp->prev = prev;
+	}
     }
     
     
-- 
2.11.4.GIT