guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/03: installer: page: Handle the case when there's no menu better.


From: Danny Milosavljevic
Subject: 01/03: installer: page: Handle the case when there's no menu better.
Date: Tue, 4 Jul 2017 16:50:20 -0400 (EDT)

dannym pushed a commit to branch wip-installer-2
in repository guix.

commit 894b0301cd0c3ae6e1aaeb8c6669551e4b5392c8
Author: Danny Milosavljevic <address@hidden>
Date:   Tue Jul 4 22:36:16 2017 +0200

    installer: page: Handle the case when there's no menu better.
    
    * gnu/system/installer/page.scm (page-default-mouse-handler): Modify.
---
 gnu/system/installer/page.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/system/installer/page.scm b/gnu/system/installer/page.scm
index aa0690a..d16cda5 100644
--- a/gnu/system/installer/page.scm
+++ b/gnu/system/installer/page.scm
@@ -61,14 +61,16 @@
 
 (define (page-default-mouse-handler page device-id x y z button-state)
   (let* ((menu (page-datum page 'menu))
-         (status (std-menu-mouse-handler menu device-id x y z button-state))
+         (status (if menu
+                     (std-menu-mouse-handler menu device-id x y z button-state)
+                     'ignored))
          (buttons (page-datum page 'navigation))
          (status (if (and (eq? status 'ignored) buttons)
                      (let ((button-status (buttons-mouse-handler buttons
                                                                  device-id
                                                                  x y z
                                                                  
button-state)))
-                       (if (eq? button-status 'activated)
+                       (if (and menu (eq? button-status 'activated))
                          (menu-set-active! menu #f))
                        button-status)
                      status)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]