mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-06 06:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't set preferences with latest defaults if there is an existent .ini file for the sprite

Browse Source 
Might fix: https://community.aseprite.org/t/grid-for-new-documents/3303
This commit is contained in:
David Capello 2019-10-29 11:19:53 -03:00
parent 31efa1ce0f
commit 002abc9245
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/pref/preferences.cpp
View File

@ -131,10 +131,15 @@ DocumentPreferences& Preferences::document(const Doc* doc)
return *it->second;
}
else {
DocumentPreferences* docPref;
if (doc) {
docPref = new DocumentPreferences("");
// Create a new DocumentPreferences for the given "doc" pointer
DocumentPreferences* docPref = new DocumentPreferences("");
m_docs[doc] = docPref;
// If there is not a .ini file with the "doc" preferences to be
// loaded, we will setup the default preferences for this file.
// (This must be done just one time, when the .ini file with the
// specific settings for "doc" doesn't exist.)
if (doc && !base::is_file(docConfigFileName(doc))) {
// The default preferences for this document are the current
// defaults for (document=nullptr).
DocumentPreferences& defPref = this->document(nullptr);
@ -144,12 +149,7 @@ DocumentPreferences& Preferences::document(const Doc* doc)
docPref->symmetry.xAxis.setDefaultValue(doc->sprite()->width()/2);
docPref->symmetry.yAxis.setDefaultValue(doc->sprite()->height()/2);
}
else
docPref = new DocumentPreferences("");
m_docs[doc] = docPref;
// Load document preferences
serializeDocPref(doc, docPref, false);
return *docPref;