Merge branch 'charlie/master' into master

Conflicts: checkin_notes
2013-03-01 15:31:10 +01:00 · 2013-03-01 15:31:10 +01:00 · 02213ba568
parent f5111aba49 062e401816
commit 02213ba568
2 changed files with 6 additions and 1 deletions
--- a/6
+++ b/6
@ -6257,6 +6257,12 @@ Charlie 18 Oct 2012
    lib/
        gui_rpc_client_ops.cpp

+Charlie 18 Oct 2012
+    - lib: don't clear entire APP_VERSION struct in APP_VERSION::parse_coproc().
+    
+    lib/
+        gui_rpc_client_ops.cpp
+
 Rom    19 Oct 2012
    - Add missing references to psapi.lib for various build configurations.

--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@ -478,7 +478,6 @@ APP_VERSION::~APP_VERSION() {
 }

 int APP_VERSION::parse_coproc(XML_PARSER& xp) {
-    memset(this, 0, sizeof(APP_VERSION));
    while (!xp.get_tag()) {
        if (xp.match_tag("/coproc")) {
            return 0;