diff --git a/CHANGELOG b/CHANGELOG index 4b07cdbbe..80bb88d55 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +sdrangel (4.11.6-1) unstable; urgency=medium + + * REST API /sdrange/config endpoint with GET, PUT, PATCH. Implements #241 + + -- Edouard Griffiths, F4EXB Mon, 12 Aug 2019 05:04:06 +0200 + sdrangel (4.11.5-1) unstable; urgency=medium * CW keyer from keyboard. Audio monitor AM, NFM, SSB modulators. Implements #385 diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f6ad2388..a1ce97475 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) # configure version set(sdrangel_VERSION_MAJOR "4") set(sdrangel_VERSION_MINOR "11") -set(sdrangel_VERSION_PATCH "5") +set(sdrangel_VERSION_PATCH "6") set(sdrangel_VERSION_SUFFIX "") # SDRAngel cmake options diff --git a/debian/changelog b/debian/changelog index 4b07cdbbe..80bb88d55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sdrangel (4.11.6-1) unstable; urgency=medium + + * REST API /sdrange/config endpoint with GET, PUT, PATCH. Implements #241 + + -- Edouard Griffiths, F4EXB Mon, 12 Aug 2019 05:04:06 +0200 + sdrangel (4.11.5-1) unstable; urgency=medium * CW keyer from keyboard. Audio monitor AM, NFM, SSB modulators. Implements #385 diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index a21bb1bbb..3ef1058d1 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -750,7 +750,10 @@ void MainWindow::loadPresetSettings(const Preset* preset, int tabIndex) } // has to be last step - restoreState(preset->getLayout()); + if (!preset->getLayout().isEmpty()) { + restoreState(preset->getLayout()); + } + tabifyDockWidget(ui->presetDock, ui->commandsDock); // override this setting ui->presetDock->raise(); }