diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
| commit | 6dbcd09121fe266c7704a524b5cbd7f2754659c0 (patch) | |
| tree | 5ae0d16cec0cc61f576d51c57b3a4613c7e91e22 /Source/WebKit/win/WebIconDatabase.cpp | |
| parent | 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (diff) | |
| download | qtwebkit-6dbcd09121fe266c7704a524b5cbd7f2754659c0.tar.gz | |
Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119)
New snapshot with prospective build fix for incorrect QtWebKit master module header file creation
Diffstat (limited to 'Source/WebKit/win/WebIconDatabase.cpp')
| -rw-r--r-- | Source/WebKit/win/WebIconDatabase.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebKit/win/WebIconDatabase.cpp b/Source/WebKit/win/WebIconDatabase.cpp index 329817aa2..cddc40d81 100644 --- a/Source/WebKit/win/WebIconDatabase.cpp +++ b/Source/WebKit/win/WebIconDatabase.cpp @@ -84,12 +84,11 @@ void WebIconDatabase::startUpIconDatabase() iconDatabase().setClient(this); - BSTR prefDatabasePath = 0; + BString prefDatabasePath; if (FAILED(standardPrefs->iconDatabaseLocation(&prefDatabasePath))) LOG_ERROR("Unable to get icon database location preference"); String databasePath(prefDatabasePath, SysStringLen(prefDatabasePath)); - SysFreeString(prefDatabasePath); if (databasePath.isEmpty()) { databasePath = localUserSpecificStorageDirectory(); |