diff -r 97232defd20e -r 356f28cd5ca0 notepad/notepad1/LibSrc/NpdListDialog.cpp --- a/notepad/notepad1/LibSrc/NpdListDialog.cpp Tue Sep 14 21:17:03 2010 +0300 +++ b/notepad/notepad1/LibSrc/NpdListDialog.cpp Wed Sep 15 12:11:35 2010 +0300 @@ -107,6 +107,11 @@ // EXPORT_C CNotepadListDialog::~CNotepadListDialog() { + if ( iServiceHandler ) + { + delete iServiceHandler; + iServiceHandler = NULL; + } delete iIdle; delete iProgressDialog; // *1* delete iEditorDialog; @@ -119,12 +124,6 @@ iSavedSelectedKeys.Close(); iSavedKeysAboveCurrent.Close(); delete iEnvironmentChangeNotifier; - if ( iServiceHandler ) - { - - delete iServiceHandler; - iServiceHandler = NULL; - } } // -----------------------------------------------------------------------------