diff --git a/checkin_notes b/checkin_notes index 506d8d1749..d65fedb7c4 100644 --- a/checkin_notes +++ b/checkin_notes @@ -4099,3 +4099,10 @@ David May 15 2008 sched/ handle_request.C server_types.C + +Rom May 16 2008 + - MGR: Fix a casting issue that was causing crashes on x64 platforms. + fixes# 658 (From: bbaetz) + + clientgui/ + SkinManager.cpp diff --git a/clientgui/SkinManager.cpp b/clientgui/SkinManager.cpp index 271f0516c2..437afe62b7 100644 --- a/clientgui/SkinManager.cpp +++ b/clientgui/SkinManager.cpp @@ -101,11 +101,11 @@ CSkinItem::~CSkinItem() { wxColour CSkinItem::ParseColor(wxString strColor) { - int red, green, blue; + long red, green, blue; wxStringTokenizer tkz(strColor, wxT(":"), wxTOKEN_RET_EMPTY); - wxString(tkz.GetNextToken()).ToLong((long*)&red); - wxString(tkz.GetNextToken()).ToLong((long*)&green); - wxString(tkz.GetNextToken()).ToLong((long*)&blue); + wxString(tkz.GetNextToken()).ToLong(&red); + wxString(tkz.GetNextToken()).ToLong(&green); + wxString(tkz.GetNextToken()).ToLong(&blue); return wxColour((unsigned char)red, (unsigned char)green, (unsigned char)blue); }