From abe25cf75bea3eebb98855ece3fcb790b2ad064a Mon Sep 17 00:00:00 2001
From: Dmitry Gorbachev <gorbachev@reactos.org>
Date: Fri, 13 Apr 2007 14:47:55 +0000
Subject: [PATCH] Fix a bug. (Thanks to Ged).

svn path=/trunk/; revision=26329
---
 reactos/base/applications/charmap/charmap.c | 7 +++++--
 reactos/base/applications/charmap/map.c     | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/reactos/base/applications/charmap/charmap.c b/reactos/base/applications/charmap/charmap.c
index 68ac14e7337..bff7b5a6e2d 100644
--- a/reactos/base/applications/charmap/charmap.c
+++ b/reactos/base/applications/charmap/charmap.c
@@ -262,8 +262,11 @@ DlgProc(HWND hDlg,
 
                     ch = SendMessage(hMap, FM_GETCHAR, 0, 0);
 
-                    AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
-                                       ch);
+                    if (ch)
+                    {
+                        AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
+                                           ch);
+                    }
 
                     break;
                 }
diff --git a/reactos/base/applications/charmap/map.c b/reactos/base/applications/charmap/map.c
index 3f485776ba9..3456e62c483 100644
--- a/reactos/base/applications/charmap/map.c
+++ b/reactos/base/applications/charmap/map.c
@@ -492,6 +492,7 @@ MapWndProc(HWND hwnd,
 
         case FM_GETCHAR:
         {
+            if (!infoPtr->pActiveCell) return NULL;
             return infoPtr->pActiveCell->ch;
         }