Merge branch 'develop' into patch-5

This commit is contained in:
Stefan authored and GitHub committed 2020-01-12 15:08:27 +01:00
commit cfec2d940b
12 files changed
+273 -41

No files matched your search

+1 -1
View File
@@ -198,7 +198,7 @@ namespace VocaluxeLib.Log
{
if (i >= propertyValues.Length)
return match.Value;
return propertyValues[i++].ToString();
return "\"" + propertyValues[i++] + "\"";
});
}
@@ -288,7 +288,9 @@ namespace VocaluxeLib.Menu.SongMenu
public void LeaveSelectedCategory()
{
_LeaveCategory();
// Stefan1200: This was implemented with the pull request #359 and is the reason for the bug described in issue #390.
// Currently disabled until we know if this is still needed or we find a better solution!
// _LeaveCategory();
}
public virtual void UnloadSkin() {}
@@ -425,4 +427,4 @@ namespace VocaluxeLib.Menu.SongMenu
}
#endregion ThemeEdit
}
}
}