mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-26 02:14:22 +00:00
Code Activity

Browse source
This commit is contained in:
jules 2007-06-29 08:47:48 +00:00
parent 79940bf1a5
commit c851625d60
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/juce_appframework/application/juce_ApplicationProperties.cpp
View file

@ -87,10 +87,10 @@ bool ApplicationProperties::testWriteAccess (const bool testUserSettings,
String filenames;
if (! userOk)
filenames << T("\n") << getUserSettings()->getFile().getFullPathName();
filenames << "\n" << getUserSettings()->getFile().getFullPathName();
if (! commonOk)
filenames << T("\n") << getCommonSettings()->getFile().getFullPathName();
filenames << "\n" << getCommonSettings()->getFile().getFullPathName();
AlertWindow::showMessageBox (AlertWindow::WarningIcon,
appName + TRANS(" - Unable to save settings"),
@ -144,7 +144,7 @@ PropertiesFile* ApplicationProperties::getCommonSettings()
if (commonProps == 0 || ! commonProps->save())
{
delete commonProps;
commonProps = userProps;
commonProps = getUserSettings();
}
}
@ -154,7 +154,7 @@ PropertiesFile* ApplicationProperties::getCommonSettings()
bool ApplicationProperties::saveIfNeeded()
{
return (userProps == 0 || userProps->saveIfNeeded())
&& (commonProps == 0 || commonProps->saveIfNeeded());
&& (commonProps == 0 || commonProps == userProps || commonProps->saveIfNeeded());
}
void ApplicationProperties::closeFiles()