Fix crash in ostabstop

frang75 · Apr 16, 2024 · 761ce9a · 761ce9a
1 parent e03a867
commit 761ce9a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -7,7 +7,8 @@
 * WindowsXP TableView/ListBox select colors. [Commit](https://github.com/frang75/nappgui_src/commit/fd0983ff06cbea190a543e9f119e749c436b954d).
 * macOS TableView/ListBox select colors. [Issue](https://github.com/frang75/nappgui_src/issues/115). [Commit](https://github.com/frang75/nappgui_src/commit/7485964f68e5647c5a31e267ce3a8d2b059ca031).
 * WindowsXP flat buttons drawing. [Commit](https://github.com/frang75/nappgui_src/commit/adbb2db0f614db810a17f6c945a44134294efa60).
-* macOS Snow Leopard focus ring.
+* macOS Snow Leopard focus ring. [Commit](https://github.com/frang75/nappgui_src/commit/0bd24f6dcb2135e8de763a8a98dd64dc7c98d6c6).
+* Crash in ColorView demo. [Issue](https://github.com/frang75/nappgui_src/issues/131).
 
 ### Removed
 
@@ -20,7 +21,7 @@
 
 ### Build system
 
-* macOS Snow Leopard/Lion compiler warnings.
+* macOS Snow Leopard/Lion compiler warnings. [Commit](https://github.com/frang75/nappgui_src/commit/66a2305261121dacd7449d4f689ca18a14fc1dc0).
 
 ## v1.4.1 - Apr 3, 2024 (r4993)
 

diff --git a/prj/build.txt b/prj/build.txt
@@ -1 +1 @@
-5032
+5038
diff --git a/src/osgui/ostabstop.c b/src/osgui/ostabstop.c
@@ -340,8 +340,11 @@ static gui_focus_t i_try_change_focus(OSTabStop *tabstop, OSControl *control, co
 
                     if (focus != next_control)
                     {
-                        i_on_focus(focus, FALSE);
-                        i_on_focus(next_control, TRUE);
+                        if (focus != NULL)
+                            i_on_focus(focus, FALSE);
+
+                        if (next_control != NULL)
+                            i_on_focus(next_control, TRUE);
                     }
 
                     fstate = ekGUI_FOCUS_CHANGED;