salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-24 11:11:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make includes work in the GUI.

Browse Source
This commit is contained in:
David Given
2022-09-11 20:08:47 +02:00
parent f792cd2677
commit a7e36472d5
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/mainwindow.cc
View File

@@ -92,7 +92,7 @@ public:
continue;
formatChoice->Append(it.first);
_formats.push_back(std::make_pair(it.first, std::move(config)));
_formatNames.push_back(it.first);
i++;
}
@@ -1051,7 +1051,7 @@ public:
auto formatSelection = formatChoice->GetSelection();
if (formatSelection == wxNOT_FOUND)
Error() << "no format selected";
config = *_formats[formatChoice->GetSelection()].second;
FlagGroup::parseConfigFile(_formatNames[formatChoice->GetSelection()], formats);
for (auto setting : split(_extraConfiguration, '\n'))
{
@@ -1285,9 +1285,9 @@ public:
int defaultFormat = 0;
int i = 0;
for (const auto& it : _formats)
for (const auto& it : _formatNames)
{
if (it.first == s)
if (it == s)
{
formatChoice->SetSelection(i);
break;
@@ -1518,8 +1518,7 @@ private:
wxConfig _config;
wxDataFormat _dndFormat;
std::vector<std::pair<std::string, std::unique_ptr<const ConfigProto>>>
_formats;
std::vector<std::string> _formatNames;
std::vector<std::unique_ptr<const CandidateDevice>> _devices;
int _state = STATE_IDLE;
int _errorState;