From 893ae16089d3f22459547774ec959ae56ce4f801 Mon Sep 17 00:00:00 2001
From: mösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Wed, 8 Jul 2009 19:19:48 +0000
Subject: LED-Zustände auch für den Lang-ſ-Modus richtig gestellt.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@1916 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 windows/neo-vars/src/source/initialize.ahk    | 10 ++++++----
 windows/neo-vars/src/source/langstastatur.ahk |  2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/windows/neo-vars/src/source/initialize.ahk b/windows/neo-vars/src/source/initialize.ahk
index a9fec08..6e233bb 100644
--- a/windows/neo-vars/src/source/initialize.ahk
+++ b/windows/neo-vars/src/source/initialize.ahk
@@ -35,6 +35,7 @@ disable=Deaktiviere %name%
 
 SetCapsLockState Off
 SetScrollLockState Off
+NEONumLockLEDState := "Off"
 SetNEONumLockState()
 OnExit, exitprogram
 
@@ -106,15 +107,16 @@ SetNEONumLockState() {
     SetNumLockState, On
     Sleep, 1           ; damit sich das Aktivieren von NumLock nicht mit dem Deaktivieren der LED prügeln muss
   }
-  KeyboardLED(2,"off") ; deaktivieren, falls sie doch brennt
+  KeyboardLED(2,NEONumLockLEDState) ; NumLock-LED richtig stellen
 }
 
 SetOldNumLockState() {
   global
-  if (SavedNumLockState == "On")
+  if (SavedNumLockState == "Off") {
+    SetNumLockState, Off   ; deaktiviert auch die eventuell eingeschaltete NumLockLED
+    Sleep, 1
+  } else if (NEONumLockLEDState == "Off")
     KeyboardLED(2,"on")
-  else
-    SetNumLockState, Off
 }
 
 %EbeneAktualisieren%()
diff --git a/windows/neo-vars/src/source/langstastatur.ahk b/windows/neo-vars/src/source/langstastatur.ahk
index e57d475..4a141cc 100644
--- a/windows/neo-vars/src/source/langstastatur.ahk
+++ b/windows/neo-vars/src/source/langstastatur.ahk
@@ -25,6 +25,7 @@ CharProc__LnS1() {
   ED("VKBASC01A",1,"U000073","U001E9E","U0000DF",""       ,"U0003C2","U002218") ; ß
   ED("VK48SC023",1,"U00017F","U000053","U00003F","U0000BF","U0003C3","U0003A3") ; s
   KeyboardLED(2,"on")
+  NEONumLockLEDState := "On"
 }
 
 CharProc__LnS0() {
@@ -33,6 +34,7 @@ CharProc__LnS0() {
   ED("VKBASC01A",1,"U0000DF","U001E9E","U00017F",""       ,"U0003C2","U002218") ; ß
   ED("VK48SC023",1,"U000073","U000053","U00003F","U0000BF","U0003C3","U0003A3") ; s
   KeyboardLED(2,"off")
+  NEONumLockLEDState := "Off"
   if (zeigeModusBox)
     TrayTip,Lange-s-Tastatur,Die Lange-s-Belegungsvariante wurde aktiviert. Zum Deaktivieren`, Mod3+F11 drücken.,10,1
 }
-- 
cgit v1.2.3