diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2017-04-15 20:02:17 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2017-04-15 20:02:17 +0300 |
| commit | 9daec8b17aba72115ffd4a92a3af5b404fb3a78b (patch) | |
| tree | 6e5f20a99ea10067a1b4cf730c00c44890bad086 | |
| parent | 98b8cbb3d98de19f99f8f7821b2b58c894bf9440 (diff) | |
Some fixes
| -rw-r--r-- | Clovershell/ClovershellConnection.cs | 3 | ||||
| -rw-r--r-- | MainForm.resx | 10 | ||||
| -rw-r--r-- | Program.cs | 12 | ||||
| -rw-r--r-- | SaveStateManager.cs | 2 | ||||
| -rw-r--r-- | hakchi_gui.csproj | 2 |
5 files changed, 20 insertions, 9 deletions
diff --git a/Clovershell/ClovershellConnection.cs b/Clovershell/ClovershellConnection.cs index ae247c90..682333f7 100644 --- a/Clovershell/ClovershellConnection.cs +++ b/Clovershell/ClovershellConnection.cs @@ -422,7 +422,8 @@ namespace com.clusterrr.clovershell len -= tLen;
if (res != ErrorCode.Ok)
{
- if (repeats >= 3) break;
+ if (repeats >= 10) break;
+ Debug.WriteLine("write error: " + res);
repeats++;
Thread.Sleep(100);
}
diff --git a/MainForm.resx b/MainForm.resx index c1f452de..6073a975 100644 --- a/MainForm.resx +++ b/MainForm.resx @@ -741,14 +741,11 @@ <data name=">>label7.ZOrder" xml:space="preserve">
<value>4</value>
</data>
- <data name="label6.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 101</value>
+ <value>15, 76</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
- <value>66, 13</value>
+ <value>82, 63</value>
</data>
<data name="label6.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
@@ -756,6 +753,9 @@ <data name="label6.Text" xml:space="preserve">
<value>Max players:</value>
</data>
+ <data name="label6.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+ <value>MiddleLeft</value>
+ </data>
<data name=">>label6.Name" xml:space="preserve">
<value>label6</value>
</data>
@@ -29,7 +29,6 @@ namespace com.clusterrr.hakchi_gui [STAThread]
static void Main()
{
- AppDomain.CurrentDomain.AppendPrivatePath("languages");
#if DEBUG
try
{
@@ -53,6 +52,17 @@ namespace com.clusterrr.hakchi_gui {
if (createdNew)
{
+ // For updates
+ AppDomain.CurrentDomain.AppendPrivatePath("languages");
+ var oldFiles = Directory.GetFiles(Path.GetDirectoryName(Application.ExecutablePath), "hakchi.resources.dll", SearchOption.AllDirectories);
+ foreach (var d in oldFiles)
+ if (!d.Contains(@"\languages\"))
+ {
+ var dir = Path.GetDirectoryName(d);
+ Debug.WriteLine("Removing old directory: " + dir);
+ Directory.Delete(dir, true);
+ }
+
Debug.WriteLine("Starting, version: " + Assembly.GetExecutingAssembly().GetName().Version);
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
diff --git a/SaveStateManager.cs b/SaveStateManager.cs index 46d92367..a222a0a5 100644 --- a/SaveStateManager.cs +++ b/SaveStateManager.cs @@ -352,7 +352,7 @@ namespace com.clusterrr.hakchi_gui foreach (ListViewItem game in listViewSaves.SelectedItems)
if (game.SubItems["colSize"].Text != null)
size += int.Parse(game.SubItems["colSize"].Text.Replace("KB", ""));
- toolStripStatusLabelSize.Text = Resources.SizeOfSaves + " " + size;
+ toolStripStatusLabelSize.Text = Resources.SizeOfSaves + " " + size + "KB";
}
else toolStripStatusLabelSize.Text = "";
}
diff --git a/hakchi_gui.csproj b/hakchi_gui.csproj index 8e54462a..dc75e774 100644 --- a/hakchi_gui.csproj +++ b/hakchi_gui.csproj @@ -36,7 +36,7 @@ <DebugType>Full</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>TRACE;DEBUG;LIBUSBDOTNET WINDOWS_TESTING VERY_DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;LIBUSBDOTNET WINDOWS_TESTING</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|