From d296f9f99daf102b9af5d56690e2bd00d61c1267 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 24 Jul 2018 11:11:26 +0300 Subject: database: - senseless fiels ptszVal removed from DBVARIANT, pwszVal is used instead; - if you want db_get to return a string, you need to use db_get_s. --- plugins/Alarms/src/alarmlist.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/Alarms/src') diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp index eabf7ad40d..37623ee409 100755 --- a/plugins/Alarms/src/alarmlist.cpp +++ b/plugins/Alarms/src/alarmlist.cpp @@ -244,12 +244,12 @@ void LoadAlarms() mir_snprintf(buff, "Title%d", i); if (!db_get_ws(0, MODULENAME, buff, &dbv)) { - alarm.szTitle = mir_wstrdup(dbv.ptszVal); + alarm.szTitle = mir_wstrdup(dbv.pwszVal); db_free(&dbv); } mir_snprintf(buff, "Desc%d", i); if (!db_get_ws(0, MODULENAME, buff, &dbv)) { - alarm.szDesc = mir_wstrdup(dbv.ptszVal); + alarm.szDesc = mir_wstrdup(dbv.pwszVal); db_free(&dbv); } mir_snprintf(buff, "Occ%d", i); @@ -302,11 +302,11 @@ void LoadAlarms() if (alarm.action & AAF_COMMAND) { mir_snprintf(buff, "ActionCommand%d", i); if (!db_get_ws(0, MODULENAME, buff, &dbv)) { - alarm.szCommand = mir_wstrdup(dbv.ptszVal); + alarm.szCommand = mir_wstrdup(dbv.pwszVal); db_free(&dbv); mir_snprintf(buff, "ActionParams%d", i); if (!db_get_ws(0, MODULENAME, buff, &dbv)) { - alarm.szCommandParams = mir_wstrdup(dbv.ptszVal); + alarm.szCommandParams = mir_wstrdup(dbv.pwszVal); db_free(&dbv); } } -- cgit v1.2.3