diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:56 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:56 +0200 |
| commit | 6f5e20bc49695159bd3b313333591c4eb27ad422 (patch) | |
| tree | 37ebef88dfd3c9f112b41e136c3a9aa73a2857b1 /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
| parent | 45b970f25634519dac302a5691a7a2d45f8db49f (diff) | |
| download | nx-libs-6f5e20bc49695159bd3b313333591c4eb27ad422.tar.gz nx-libs-6f5e20bc49695159bd3b313333591c4eb27ad422.tar.bz2 nx-libs-6f5e20bc49695159bd3b313333591c4eb27ad422.zip | |
Imported nxagent-3.3.0-9.tar.gznxagent/3.3.0-9
Summary: Imported nxagent-3.3.0-9.tar.gz
Keywords:
Imported nxagent-3.3.0-9.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index ce3e6ee05..69b73a942 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -547,28 +547,29 @@ Bool nxagentReconnectSession(void) goto nxagentReconnectError; } - if (nxagentOption(ResetKeyboardAtResume)) + if (nxagentOption(ResetKeyboardAtResume) == 1 && + (nxagentKeyboard == NULL || nxagentOldKeyboard == NULL || + strcmp(nxagentKeyboard, nxagentOldKeyboard) != 0 || + strcmp(nxagentKeyboard, "query") == 0)) { - if (nxagentKeyboard == NULL || nxagentOldKeyboard == NULL || - strcmp(nxagentKeyboard, nxagentOldKeyboard) != 0 || - strcmp(nxagentKeyboard, "query") == 0) + if (nxagentResetKeyboard() == 0) { - - if (nxagentResetKeyboard() == 0) + #ifdef WARNING + if (nxagentVerbose == 1) { - #ifdef WARNING - if (nxagentVerbose == 1) - { - fprintf(stderr, "nxagentReconnect: Failed to reset keyboard device.\n"); - } - #endif + fprintf(stderr, "nxagentReconnect: Failed to reset keyboard device.\n"); + } + #endif - failedStep = WINDOW_STEP; + failedStep = WINDOW_STEP; - goto nxagentReconnectError; - } + goto nxagentReconnectError; } } + else + { + nxagentResetKeycodeConversion(); + } nxagentXkbState.Initialized = 0; |