mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 11:00:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when browsing a view

Browse Source 
This was introduced by 2b6153d9b8.
This commit is contained in:
Martin Kleusberg
2018-08-21 20:26:48 +02:00
parent b7dbfc84c9
commit d5a049062d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/MainWindow.cpp
View File

@@ -3021,6 +3021,12 @@ void MainWindow::unlockViewEditing(bool unlock, QString pk)
enableEditing(true);
return;
}
// If the settings didn't change, do nothing. This avoids an infinite loop
BrowseDataTableSettings& settings = browseTableSettings[currentTable];
if(unlock != settings.unlockViewPk.isEmpty() && settings.unlockViewPk == pk)
return;
sqlb::ViewPtr obj = db.getObjectByName(currentTable).dynamicCast<sqlb::View>();
// If the view gets unlocked for editing and we don't have a 'primary key' for this view yet, then ask for one
@@ -3065,7 +3071,6 @@ void MainWindow::unlockViewEditing(bool unlock, QString pk)
ui->actionUnlockViewEditing->blockSignals(false);
// Save settings for this table
BrowseDataTableSettings& settings = browseTableSettings[currentTable];
settings.unlockViewPk = pk;
// Reapply the view settings. This seems to be necessary as a workaround for newer Qt versions.