[ros-diffs] [cfinck] 37174: Merge r37097, r37173

[cfinck at svn.reactos.org]

Author: cfinck
Date: Mon Nov  3 13:05:14 2008
New Revision: 37174

URL: http://svn.reactos.org/svn/reactos?rev=37174&view=rev
Log:
Merge r37097, r37173

Modified:
    branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/shutdown.ico
    branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c

Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/shutdown.ico
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/shutdown.ico?rev=37174&r1=37173&r2=37174&view=diff
==============================================================================
Binary files - no diff available.

Modified: branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c?rev=37174&r1=37173&r2=37174&view=diff
==============================================================================
--- branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original)
+++ branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Mon Nov  3 13:05:14 2008
@@ -442,9 +442,10 @@
          hr = CreateNotificationObject(This,iface, pUnk);
          if (FAILED(hr))
              return hr;
-         if (dwFlags == NCRP_QUERY_PROPERTY_UI)
-             return S_OK;
-    }
+    }
+
+    if (dwFlags == NCRP_QUERY_PROPERTY_UI)
+        return S_OK;
 
     dwDefPages = 0;
     Pages = 0;