beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

logger: Fix possible sharing violation on log file

Browse source
This commit is contained in:
Hylke Bons 2018-03-14 21:34:06 +00:00
parent e0a2e2a0b6
commit 0a847be8bb
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SparkleShare/Linux/UserInterface.cs
View file

@ -24,10 +24,8 @@ using Sparkles;
namespace SparkleShare
{
public class UserInterface
{
public static string AssetsPath = InstallationInfo.Directory;
public StatusIcon StatusIcon;
@ -53,7 +51,8 @@ namespace SparkleShare
application.Register (null);
application.Activated += ApplicationActivatedDelegate;
IconTheme.Default.AppendSearchPath (Path.Combine (UserInterface.AssetsPath, "icons"));
if (IconTheme.Default != null)
IconTheme.Default.AppendSearchPath (Path.Combine (UserInterface.AssetsPath, "icons"));
var label = new Label ();
Gdk.Color color = UserInterfaceHelpers.RGBAToColor (label.StyleContext.GetColor (StateFlags.Insensitive));

5
Sparkles/Logger.cs
View file

@ -22,7 +22,7 @@ namespace Sparkles {
public static class Logger {
static StreamWriter log_writer = File.AppendText (Configuration.DefaultConfiguration.LogFilePath);
static StreamWriter log_writer = File.CreateText (Configuration.DefaultConfiguration.LogFilePath);
static object log_writer_lock = new object ();
@ -63,6 +63,9 @@ namespace Sparkles {
public static void WriteCrashReport (Exception e)
{
if (log_writer != null)
log_writer.Close ();
string home_path = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
if (InstallationInfo.OperatingSystem == OS.Windows)