summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-01-03 20:47:55 +0100
committerStanislaw Halik <sthalik@misaki.pl>2014-01-03 20:47:55 +0100
commit01b0a3bcfa48422289dab9df7af88eda52e80d9d (patch)
tree63ed135e6d07137c689ec5c919349a3f175cec18
parenta97755aecdd6632b13f026e1a1e5cbc1cd18e22e (diff)
initialize joylist in right order. pad out device list.
-rw-r--r--ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
index 812ad454..a22c90f4 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -19,7 +19,6 @@ TrackerControls::TrackerControls() : tracker(nullptr)
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK()));
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
- tie_setting(s.joyid, ui.joylist);
tie_setting(s.axis_0, ui.comboBox);
tie_setting(s.axis_1, ui.comboBox_2);
tie_setting(s.axis_2, ui.comboBox_3);
@@ -45,6 +44,15 @@ fin:
if (g_pDI)
g_pDI->Release();
}
+
+ for (int i = ui.joylist->count(); i < 8; i++)
+ {
+ GUID dummy = {0};
+ guids.push_back(dummy);
+ ui.joylist->addItem("Nonexistent");
+ }
+
+ tie_setting(s.joyid, ui.joylist);
}
void TrackerControls::doOK() {