Skip to content

Commit 7ac884f

Browse files
author
K9spud LLC
committed
More user friendly database creation
1 parent f4fdc37 commit 7ac884f

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

browser.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,14 @@ int Browser::createWindowId()
398398
{
399399
if(qry.next())
400400
{
401-
windowId = qry.value(0).toInt() + 1;
401+
if(qry.value(0).isNull())
402+
{
403+
windowId = 0;
404+
}
405+
else
406+
{
407+
windowId = qry.value(0).toInt() + 1;
408+
}
402409
}
403410
}
404411

browserwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ BrowserWindow::BrowserWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::
417417
// ------------------------------------------------------------------------
418418

419419
setWorking(false);
420-
setWindowTitle(QString("%1 v%2").arg(APP_NAME, APP_VERSION));
421420
updateAskButton();
422421
updateClipButton();
423422

@@ -781,6 +780,7 @@ void BrowserWindow::reloadDatabase()
781780
currentView()->saveScrollPosition();
782781
currentView()->reloadingDatabase();
783782
currentView()->setStatus("Loading package database...");
783+
setWindowTitle(QString("%1 v%2").arg(APP_NAME, APP_VERSION));
784784
rescan->rescan();
785785
}
786786

compositeview.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,13 @@ void CompositeView::reload(bool hardReload)
181181

182182
void CompositeView::reloadingDatabase()
183183
{
184-
if(browserView != nullptr)
184+
if(browserView == nullptr)
185185
{
186-
browserView->reloadingDatabase();
186+
browser()->reloadingDatabase();
187187
}
188-
else if(imageView != nullptr)
188+
else
189189
{
190+
browserView->reloadingDatabase();
190191
}
191192
}
192193

main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ int main(int argc, char *argv[])
146146
{
147147
window = browser->windows.first();
148148
}
149+
149150
if(window != nullptr)
150151
{
151152
if(ds->emptyDatabase)

0 commit comments

Comments
 (0)