summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>2007-03-09 01:21:04 +0000
committersje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>2007-03-09 01:21:04 +0000
commite2926efe749018b24db79a51cdd2e71226768dee (patch)
tree54c68ddcdaa158cbe2ad84a769c895ebc4eeddbd
parent8289b5770dcd59a911c7372a471ffb7b3f34df9b (diff)
fix to use of invalid params in GetColour service (thx Bio)
git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@125 4f64403b-2f21-0410-a795-97e2b3489a10
-rw-r--r--font_service/FontService.cpp2
-rw-r--r--font_service/FontService.mdsp6
-rw-r--r--font_service/services.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/font_service/FontService.cpp b/font_service/FontService.cpp
index 6895be2..c53c0fe 100644
--- a/font_service/FontService.cpp
+++ b/font_service/FontService.cpp
@@ -15,7 +15,7 @@ PLUGININFO pluginInfo={
#else
"FontService",
#endif
- PLUGIN_MAKE_VERSION(0, 2, 0, 1),
+ PLUGIN_MAKE_VERSION(0, 2, 0, 2),
"Provides a UI for font settings, and services to plugins for font control.",
"S. Ellis",
"mail@scottellis.com.au",
diff --git a/font_service/FontService.mdsp b/font_service/FontService.mdsp
index 472aa47..9732c75 100644
--- a/font_service/FontService.mdsp
+++ b/font_service/FontService.mdsp
@@ -98,7 +98,7 @@ extraResourceOptions=
1=resource.rc
[Other]
[History]
-options.cpp,986
-FontService.h,682
collection.h,3038
-FontService.cpp,353
+FontService.h,682
+options.cpp,962
+FontService.cpp,0
diff --git a/font_service/services.cpp b/font_service/services.cpp
index 997b42e..3c7213e 100644
--- a/font_service/services.cpp
+++ b/font_service/services.cpp
@@ -342,7 +342,7 @@ int GetColourW(WPARAM wParam, LPARAM lParam) {
ColourIDW *colour_id = (ColourIDW *)wParam;
for(ColourIDWList::Iterator i = colour_id_list_w.start(); i.has_val(); i.next()) {
if(wcscmp(i.val().first.group, colour_id->group) == 0 && wcscmp(i.val().first.name, colour_id->name) == 0)
- return (int)DBGetContactSettingDword(NULL, colour_id->dbSettingsGroup, colour_id->setting, i.val().first.defcolour);
+ return (int)DBGetContactSettingDword(NULL, i.val().first.dbSettingsGroup, i.val().first.setting, i.val().first.defcolour);
}
return -1;