diff --git a/JuceLibraryCode/src/core/juce_SystemStats.h b/JuceLibraryCode/src/core/juce_SystemStats.h index ff062da58d8302b50895c3c9e6583abec3fb3434..ee31c5360c61a47827c437f46841a8836691c635 100755 --- a/JuceLibraryCode/src/core/juce_SystemStats.h +++ b/JuceLibraryCode/src/core/juce_SystemStats.h @@ -145,10 +145,17 @@ public: */ static int getPageSize(); + /** Returns an environment variable. + If the named value isn't set, this will return the defaultValue string instead. + */ + static String getEnvironmentVariable (const String& name, const String& defaultValue); + //============================================================================== // not-for-public-use platform-specific method gets called at startup to initialise things. static void initialiseStats(); + + private: struct CPUFlags { diff --git a/JuceLibraryCode/src/native/linux/juce_linux_Fonts.cpp b/JuceLibraryCode/src/native/linux/juce_linux_Fonts.cpp index c60836bc967eaf5075d79853a2781a485c8cf196..5f8d8565b3bd98970899454b0091e43185fbac0f 100755 --- a/JuceLibraryCode/src/native/linux/juce_linux_Fonts.cpp +++ b/JuceLibraryCode/src/native/linux/juce_linux_Fonts.cpp @@ -103,7 +103,7 @@ public: { const ScopedPointer<XmlElement> fontsInfo (XmlDocument::parse (File ("/etc/fonts/fonts.conf"))); - if (fontsInfo != nullptr) + if (fontsInfo != 0) { forEachXmlChildElementWithTagName (*fontsInfo, e, "dir") { @@ -113,10 +113,10 @@ public: { if (e->getStringAttribute ("prefix") == "xdg") { - String xdgDataHome (SystemStats::getEnvironmentVariable ("XDG_DATA_HOME", String::empty)); + String xdgDataHome = "~/.local/share";//(SystemStats::getEnvironmentVariable ("XDG_DATA_HOME", String::empty)); - if (xdgDataHome.trimStart().isEmpty()) - xdgDataHome = "~/.local/share"; + // if (xdgDataHome.trimStart().isEmpty()) + // xdgDataHome = "~/.local/share"; fontPath = File (xdgDataHome).getChildFile (fontPath).getFullPathName(); }