diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-24 11:11:26 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-24 11:11:26 +0300 |
| commit | d296f9f99daf102b9af5d56690e2bd00d61c1267 (patch) | |
| tree | 39311caaf80abf0b47ecb78cf94dc8157b193575 /plugins/wbOSD/src | |
| parent | ffc521e5d5e9bd66feb65afe0046b3fc7e073356 (diff) | |
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.
Diffstat (limited to 'plugins/wbOSD/src')
| -rw-r--r-- | plugins/wbOSD/src/events.cpp | 2 | ||||
| -rw-r--r-- | plugins/wbOSD/src/options.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp index b16bcd1c97..9269daf7ea 100644 --- a/plugins/wbOSD/src/events.cpp +++ b/plugins/wbOSD/src/events.cpp @@ -156,7 +156,7 @@ int HookedNewEvent(WPARAM wParam, LPARAM hDBEvent) DBVARIANT dbv;
if (!db_get_ws(NULL, MODULENAME, "message_format", &dbv)) {
- mir_wstrcpy(buf, dbv.ptszVal);
+ mir_wstrcpy(buf, dbv.pwszVal);
db_free(&dbv);
}
diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp index 4e2cb3f448..cea0f87793 100644 --- a/plugins/wbOSD/src/options.cpp +++ b/plugins/wbOSD/src/options.cpp @@ -128,7 +128,7 @@ void loadDBSettings(plgsettings *ps) DBVARIANT dbv;
if (!db_get_ws(NULL, MODULENAME, "message_format", &dbv)) {
- mir_wstrcpy(ps->msgformat, dbv.ptszVal);
+ mir_wstrcpy(ps->msgformat, dbv.pwszVal);
db_free(&dbv);
}
else mir_wstrcpy(ps->msgformat, DEFAULT_MESSAGEFORMAT);
@@ -150,7 +150,7 @@ void loadDBSettings(plgsettings *ps) ps->lf.lfPitchAndFamily = db_get_b(NULL, MODULENAME, "fntPitchAndFamily", DEFAULT_FNT_PITCHANDFAM);
if (!db_get_ws(NULL, MODULENAME, "fntFaceName", &dbv)) {
- mir_wstrcpy(ps->lf.lfFaceName, dbv.ptszVal);
+ mir_wstrcpy(ps->lf.lfFaceName, dbv.pwszVal);
db_free(&dbv);
}
else
|