[dgorbachev] 26329: Fix a bug. (Thanks to Ged).

Author: dgorbachev
Date: Fri Apr 13 18:47:55 2007
New Revision: 26329

URL: http://svn.reactos.org/svn/reactos?rev=26329&view=rev
Log:
Fix a bug. (Thanks to Ged).

Modified:
    trunk/reactos/base/applications/charmap/charmap.c
    trunk/reactos/base/applications/charmap/map.c

Modified: trunk/reactos/base/applications/charmap/charmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/charmap.c (original)
+++ trunk/reactos/base/applications/charmap/charmap.c Fri Apr 13 18:47:55 2007
@@ -262,8 +262,11 @@
 
                     ch = SendMessage(hMap, FM_GETCHAR, 0, 0);
 
-                    AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
-                                       ch);
+                    if (ch)
+                    {
+                        AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
+                                           ch);
+                    }
 
                     break;
                 }

Modified: trunk/reactos/base/applications/charmap/map.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/map.c (original)
+++ trunk/reactos/base/applications/charmap/map.c Fri Apr 13 18:47:55 2007
@@ -492,6 +492,7 @@
 
         case FM_GETCHAR:
         {
+            if (!infoPtr->pActiveCell) return NULL;
             return infoPtr->pActiveCell->ch;
         }