Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/cppbase/bs_config.cpp

    r343 r369  
    6969
    7070/*
    71  *      This file Copyright (C) 1999-2006 Ulrich M”ller.
     71 *      This file Copyright (C) 1999-2008 Ulrich M”ller.
    7272 *      This program is free software; you can redistribute it and/or modify
    7373 *      it under the terms of the GNU General Public License as published by
     
    16941694 *
    16951695 *@@changed V0.9.18 (2002-03-08) [umoeller]: added codec
     1696 *@@changed V1.0.18 (2008-09-27) [pr]: no error if object no longer exists @@fixes 1062
    16961697 */
    16971698
     
    17081709    {
    17091710        if (pLogFile)
    1710             pLogFile->Write("Error deleting WPS object \"%s\"",
     1711            pLogFile->Write("Error locating WPS object \"%s\"",
    17111712                             pcszObjectID);
    1712 
    1713         throw BSConfigExcpt(WPOEXCPT_DELETEOBJECT, 0);
    1714     }
    1715 
    1716     if (!WinDestroyObject(hobj))
    1717     {
    1718         if (pLogFile)
    1719             pLogFile->Write("Error deleting WPS object \"%s\", HOBJECT was 0x%lX",
    1720                              pcszObjectID,
    1721                              hobj);
    1722 
    1723         throw BSConfigExcpt(WPOEXCPT_DELETEOBJECT, 0);
    1724     }
     1713    }
     1714    else
     1715        if (!WinDestroyObject(hobj))
     1716        {
     1717            if (pLogFile)
     1718                pLogFile->Write("Error deleting WPS object \"%s\", HOBJECT was 0x%lX",
     1719                                 pcszObjectID,
     1720                                 hobj);
     1721
     1722            throw BSConfigExcpt(WPOEXCPT_DELETEOBJECT, 0);
     1723        }
    17251724
    17261725    return (irc);
Note: See TracChangeset for help on using the changeset viewer.