Changeset 369

Timestamp:

Sep 27, 2008, 5:07:41 PM (17 years ago)

Author:

pr

Message:

No error if WPS object being deleted no longer exists. Bug 1062.

File:

• trunk/src/cppbase/bs_config.cpp (modified) (3 diffs)

trunk/src/cppbase/bs_config.cpp

@@ -69 +69 @@
 
 /*
- *      This file Copyright (C) 1999-2006 Ulrich M”ller.
+ *      This file Copyright (C) 1999-2008 Ulrich M”ller.
  *      This program is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License as published by
@@ -1694 +1694 @@
  *
  *@@changed V0.9.18 (2002-03-08) [umoeller]: added codec
+ *@@changed V1.0.18 (2008-09-27) [pr]: no error if object no longer exists @@fixes 1062
  */
 
@@ -1708 +1709 @@
     {
         if (pLogFile)
-            pLogFile->Write("Error deleting WPS object \"%s\"",
+            pLogFile->Write("Error locating WPS object \"%s\"",
                              pcszObjectID);
-
-        throw BSConfigExcpt(WPOEXCPT_DELETEOBJECT, 0);
-    }
-
-    if (!WinDestroyObject(hobj))
-    {
-        if (pLogFile)
-            pLogFile->Write("Error deleting WPS object \"%s\", HOBJECT was 0x%lX",
-                             pcszObjectID,
-                             hobj);
-
-        throw BSConfigExcpt(WPOEXCPT_DELETEOBJECT, 0);
-    }
+    }
+    else
+        if (!WinDestroyObject(hobj))
+        {
+            if (pLogFile)
+                pLogFile->Write("Error deleting WPS object \"%s\", HOBJECT was 0x%lX",
+                                 pcszObjectID,
+                                 hobj);
+
+            throw BSConfigExcpt(WPOEXCPT_DELETEOBJECT, 0);
+        }
 
     return (irc);