diff options
| author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2013-10-31 22:59:14 +0200 |
|---|---|---|
| committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2013-10-31 22:59:38 +0200 |
| commit | a97d4f941c5a45296acecc16a11178ad93b5c19a (patch) | |
| tree | 94c2718dd8fa581ba0540457128c2d209f906b21 /src/native | |
| parent | 7f0c0810dba7004d36e26eca6c5a28188c01fc93 (diff) | |
| download | jitsi-a97d4f941c5a45296acecc16a11178ad93b5c19a.zip jitsi-a97d4f941c5a45296acecc16a11178ad93b5c19a.tar.gz jitsi-a97d4f941c5a45296acecc16a11178ad93b5c19a.tar.bz2 | |
Fixes an issue with setup.exe which could prevent Jitsi from applying a delta update.
Diffstat (limited to 'src/native')
| -rw-r--r-- | src/native/windows/run/registry.c | 2 | ||||
| -rw-r--r-- | src/native/windows/setup/setup.c | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/native/windows/run/registry.c b/src/native/windows/run/registry.c index 825ec0e..f293c5a 100644 --- a/src/native/windows/run/registry.c +++ b/src/native/windows/run/registry.c @@ -45,6 +45,8 @@ Run_getRegSzValue(HKEY key, LPCTSTR name, LPTSTR *data) }
}
}
+ else
+ error = ERROR_NOT_ENOUGH_MEMORY;
}
else
error = ERROR_FILE_NOT_FOUND;
diff --git a/src/native/windows/setup/setup.c b/src/native/windows/setup/setup.c index a16e06e..4ef8f1c 100644 --- a/src/native/windows/setup/setup.c +++ b/src/native/windows/setup/setup.c @@ -861,7 +861,16 @@ Setup_findProductIdByPackageCode(LPCTSTR packageCode, LPTSTR *productId) free(packageCodeOfProductId);
}
else
- LastError_setLastError(error, _T(__FILE__), __LINE__);
+ {
+ /*
+ * We failed to read one PackageCode out of many while looking
+ * for ours. Eventually, it makes no difference whether the
+ * failed one was ours or not. Most importantly, we cannot give
+ * up the search because the failed one may have not been ours
+ * anyway.
+ */
+ error = ERROR_SUCCESS;
+ }
RegCloseKey(subKey);
if (ERROR_SUCCESS != error)
break;
|