mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 13:10:04 -05:00
Merged in master (pull request #68)
--Bug fixes -Error when saving screen on macOS at first time. Approved-by: Matt Feemster
This commit is contained in:
commit
d629c629e5
@ -86,7 +86,11 @@ void FractoriumSettings::EnsureDefaults()
|
||||
OpenImageExt("*.png");
|
||||
|
||||
if (SaveImageExt() == "")
|
||||
SaveImageExt(".png");
|
||||
#ifndef __APPLE__
|
||||
SaveImageExt(".png");
|
||||
#else
|
||||
SaveImageExt("Png (*.png)");
|
||||
#endif
|
||||
|
||||
if (FinalExt() != "jpg" && FinalExt() != "png" && FinalExt() != "exr"
|
||||
#ifdef _WIN32
|
||||
|
@ -666,7 +666,7 @@ QString QssDialog::OpenFile()
|
||||
|
||||
return !filenames.empty() ? filenames[0] : "";
|
||||
#else
|
||||
auto filename = QFileDialog::getOpenFileName(this, tr("Open Stylesheet"), /*m_Parent->m_SettingsPath*/ "./", tr("Qss (*.qss)"));
|
||||
auto filename = QFileDialog::getOpenFileName(this, tr("Open Stylesheet"), m_Parent->m_SettingsPath, tr("Qss (*.qss)"));
|
||||
return filename.size() > 0 ? filename : "";
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user