From 162c8ddd463f17d84b7224219119f8acef6ce23d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 28 Oct 2015 17:34:49 +0000
Subject: fix for db_unset() calls over resident variables

git-svn-id: http://svn.miranda-ng.org/main/trunk@15637 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/mir_app/src/mdatabasecache.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/mdatabasecache.cpp b/src/mir_app/src/mdatabasecache.cpp
index 82c5a54ef8..bddeecb750 100644
--- a/src/mir_app/src/mdatabasecache.cpp
+++ b/src/mir_app/src/mdatabasecache.cpp
@@ -24,6 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"
 #include "database.h"
 
+static DBVARIANT temp;
+
 static int stringCompare(const char *p1, const char *p2)
 {
 	return mir_strcmp(p1, p2);
@@ -185,7 +187,7 @@ STDMETHODIMP_(DBVARIANT*) MDatabaseCache::GetCachedValuePtr(MCONTACT contactID,
 				FreeCachedVariant(&V->value);
 				m_lGlobalSettings.remove(index);
 				HeapFree(m_hCacheHeap, 0, V);
-				return NULL;
+				return &temp; // not null - smth were deleted
 			}
 		}
 		else {
@@ -245,7 +247,7 @@ STDMETHODIMP_(DBVARIANT*) MDatabaseCache::GetCachedValuePtr(MCONTACT contactID,
 					break;
 				}
 		HeapFree(m_hCacheHeap, 0, V);
-		return NULL;
+		return &temp; // not null - smth were deleted
 	}
 
 	return &V->value;
-- 
cgit v1.2.3