olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp

This commit is contained in:
Jonathan 2023-07-16 19:53:27 -04:00
parent 312184e3bb c243be2b14
commit a5c0f0e768
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lightpreview/mainwindow.cpp
View File

@ -409,7 +409,13 @@ void MainWindow::showEvent(QShowEvent *event)
void MainWindow::fileOpen() void MainWindow::fileOpen()
{ {
QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "", tr("Map (*.map);; BSP (*.bsp)")); // open the file browser in the directory containing the currently open file, if there is one
QString currentDir;
if (!m_mapFile.isEmpty()) {
currentDir = QFileInfo(m_mapFile).absolutePath();
}
QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), currentDir, tr("Map (*.map);; BSP (*.bsp)"));
if (!fileName.isEmpty()) if (!fileName.isEmpty())
loadFile(fileName); loadFile(fileName);
@ -693,7 +699,7 @@ void MainWindow::compileThreadExited()
delete m_compileThread; delete m_compileThread;
m_compileThread = nullptr; m_compileThread = nullptr;
if (!std::holds_alternative<mbsp_t>(m_bspdata.bsp)) { if (!std::holds_alternative<mbsp_t>(m_bspdata.bsp)) {
return; return;
} }