Merge remote-tracking branch 'origin/master'

This commit is contained in:
James Booth
2016-02-28 23:18:50 +00:00
3 changed files with 4 additions and 2 deletions

View File

@@ -74,7 +74,7 @@ plugin_themes_close(void)
theme_item_t
plugin_themes_get(const char *const group, const char *const key, const char *const def)
{
if (group && key && def && g_key_file_has_key(themes, group, key, NULL)) {
if (group && key && g_key_file_has_key(themes, group, key, NULL)) {
gchar *result = g_key_file_get_string(themes, group, key, NULL);
theme_item_t ret;