Fix a bug. (Thanks to Ged).

svn path=/trunk/; revision=26329

diff --git a/reactos/base/applications/charmap/charmap.c b/reactos/base/applications/charmap/charmap.c
index 68ac14e..bff7b5a 100644 (file)
--- a/reactos/base/applications/charmap/charmap.c
+++ b/reactos/base/applications/charmap/charmap.c
@@ -262,8 +262,11 @@ DlgProc(HWND hDlg,
 \r
                     ch = SendMessage(hMap, FM_GETCHAR, 0, 0);\r
 \r
-                    AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),\r
-                                       ch);\r
+                    if (ch)\r
+                    {\r
+                        AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),\r
+                                           ch);\r
+                    }\r
 \r
                     break;\r
                 }\r

diff --git a/reactos/base/applications/charmap/map.c b/reactos/base/applications/charmap/map.c
index 3f48577..3456e62 100644 (file)
--- a/reactos/base/applications/charmap/map.c
+++ b/reactos/base/applications/charmap/map.c
@@ -492,6 +492,7 @@ MapWndProc(HWND hwnd,
 \r
         case FM_GETCHAR:\r
         {\r
+            if (!infoPtr->pActiveCell) return NULL;\r
             return infoPtr->pActiveCell->ch;\r
         }\r
 \r