summaryrefslogtreecommitdiff
path: root/plugins/Sessions
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Sessions')
-rw-r--r--plugins/Sessions/Src/Options.cpp17
-rw-r--r--plugins/Sessions/Src/version.h2
-rw-r--r--plugins/Sessions/res/Sessions.rc4
3 files changed, 8 insertions, 15 deletions
diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp
index 4ecbc0f9aa..b2f7a8d492 100644
--- a/plugins/Sessions/Src/Options.cpp
+++ b/plugins/Sessions/Src/Options.cpp
@@ -215,10 +215,8 @@ public:
if (startupmode == 1)
chkStartDialog.SetState(true);
- else if (startupmode == 3) {
- chkStartDialog.SetState(true);
+ else if (startupmode == 3)
chkLast.SetState(true);
- }
else if (startupmode == 2)
chkLoadLast.SetState(true);
else if (startupmode == 0)
@@ -263,12 +261,10 @@ public:
else if (chkExitAsk.IsChecked())
g_plugin.setByte("ShutdownMode", 1);
- if (chkStartDialog.IsChecked()) {
- if (chkLast.IsChecked())
- g_plugin.setByte("StartupMode", 1);
- else
- g_plugin.setByte("StartupMode", 3);
- }
+ if (chkStartDialog.IsChecked())
+ g_plugin.setByte("StartupMode", 1);
+ else if (chkLast.IsChecked())
+ g_plugin.setByte("StartupMode", 3);
else if (chkLoadLast.IsChecked())
g_plugin.setByte("StartupMode", 2);
else if (chkNothing.IsChecked())
@@ -427,7 +423,6 @@ public:
EnableWindow(GetDlgItem(m_hwnd, IDC_STARTDELAY), TRUE);
EnableWindow(GetDlgItem(m_hwnd, IDC_STATICOP), TRUE);
EnableWindow(GetDlgItem(m_hwnd, IDC_STATICMS), TRUE);
- chkLast.Enable();
}
void onChange_LoadLast(CCtrlCheck *pCheck)
@@ -437,7 +432,6 @@ public:
EnableWindow(GetDlgItem(m_hwnd, IDC_STARTDELAY), TRUE);
EnableWindow(GetDlgItem(m_hwnd, IDC_STATICOP), TRUE);
EnableWindow(GetDlgItem(m_hwnd, IDC_STATICMS), TRUE);
- chkLast.Disable();
}
void onChange_Nothing(CCtrlCheck *pCheck)
@@ -447,7 +441,6 @@ public:
EnableWindow(GetDlgItem(m_hwnd, IDC_STARTDELAY), FALSE);
EnableWindow(GetDlgItem(m_hwnd, IDC_STATICOP), FALSE);
EnableWindow(GetDlgItem(m_hwnd, IDC_STATICMS), FALSE);
- chkLast.Disable();
}
void onChange_ExSave(CCtrlCheck *pCheck)
diff --git a/plugins/Sessions/Src/version.h b/plugins/Sessions/Src/version.h
index 99c74d5e37..f16c634fe3 100644
--- a/plugins/Sessions/Src/version.h
+++ b/plugins/Sessions/Src/version.h
@@ -1,7 +1,7 @@
#define __MAJOR_VERSION 0
#define __MINOR_VERSION 2
#define __RELEASE_NUM 0
-#define __BUILD_NUM 1
+#define __BUILD_NUM 2
#include <stdver.h>
diff --git a/plugins/Sessions/res/Sessions.rc b/plugins/Sessions/res/Sessions.rc
index 199996ab26..ccb6d1693b 100644
--- a/plugins/Sessions/res/Sessions.rc
+++ b/plugins/Sessions/res/Sessions.rc
@@ -57,9 +57,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Action on Startup",IDC_STATIC,6,11,157,75
CONTROL "Open Sessions Manager dialog",IDC_STARTDIALOG,"Button",BS_AUTORADIOBUTTON | WS_GROUP,9,21,144,10
+ CONTROL "Open dialog if last session present",IDC_CHECKLAST,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,9,32,144,10
CONTROL "Restore Last Session",IDC_RLOADLAST,"Button",BS_AUTORADIOBUTTON,9,43,144,10
- CONTROL "Do nothing",IDC_RNOTHING,"Button",BS_AUTORADIOBUTTON,9,55,144,10
- CONTROL "Only if last session present",IDC_CHECKLAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,32,126,10
+ CONTROL "Do nothing",IDC_RNOTHING,"Button",BS_AUTORADIOBUTTON,9,54,144,10
EDITTEXT IDC_STARTDELAY,105,70,26,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Startup delay",IDC_STATICOP,9,72,93,8
LTEXT "ms",IDC_STATICMS,136,72,16,8