Changeset 529

Timestamp:

Nov 4, 2006, 10:02:53 PM (19 years ago)

Author:

root

Message:

Rework replace logic

File:

• trunk/dll/assoc.c (modified) (7 diffs)

trunk/dll/assoc.c

@@ -11 +11 @@
   29 Jul 06 SHL Use xfgets, xfgets_bstripcr
   10 Sep 06 GKY Add Move to last, Okay adds if new, Replace Current in Listbox Dialog
+  19 Oct 06 GKY Rework replace logic
 
 **************************************************************************************/
@@ -51 +52 @@
 
 static LINKASSOC *asshead     = NULL,*asstail = NULL;
-static BOOL       assloaded = FALSE;
+static BOOL       assloaded = FALSE,replace = FALSE ;
 
 static PSZ pszSrcFile = __FILE__;
@@ -255 +256 @@
   if(addme && *addme->cl && *addme->mask) {
     info = asshead;
-    while(info) {
-      if(!stricmp(info->mask,addme->mask) &&
-         ((!info->sig && !*addme->sig) ||
-          (info->sig && !strcmp(addme->sig,info->sig))))
+    while(info)  {
+      if((!replace) && (!stricmp(info->mask,addme->mask) &&
+         ((!info->sig && !*addme->sig) || (!replace) &&
+          (info->sig && !strcmp(addme->sig,info->sig)))))
         return NULL;
       info = info->next;
@@ -682 +683 @@
                     {
             ASSOC temp;
-            CHAR  dummy[34];{
+            CHAR  dummy[34];
+            replace=FALSE;
+            {
             x = (SHORT)WinSendDlgItemMsg(hwnd,
                                            ASS_LISTBOX,
@@ -776 +779 @@
             ASSOC temp;
             CHAR  dummy[34];
+            replace=FALSE;
 
             memset(&temp,0,sizeof(ASSOC));
@@ -884 +888 @@
           break;
       case ASS_REPLACE:
-               
-               
 
                        {
             ASSOC temp;
             CHAR  dummy[34];
+            replace=TRUE;
 
             y = (SHORT)WinSendDlgItemMsg(hwnd,
@@ -985 +988 @@
               Runtime_Error(pszSrcFile, __LINE__, "kill_association");
             else {
-              
+
               if(y >= 0) {
                 WinSendDlgItemMsg(hwnd,