HiImRay_Public/bookmark-manager
HiImRay_Public/bookmark-manager
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'hotfix/save-error' into 'master'

Browse Source 
Hotfix/save error

See merge request hi-im-ray/bookmark-manager!4
This commit is contained in:
Ray 2020-09-05 01:28:27 +00:00
commit 7e7d0330c1
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LoadBookmarksForm.cs
View File

@ -115,6 +115,10 @@ namespace bzit.bomg
return; return;
} }
} }
else
{
parentForm.SetSessionFile(filename, string.Empty);
}
this.IsBusy = true; this.IsBusy = true;

2
Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.3.0.030")] [assembly: AssemblyVersion("0.3.0.031")]
[assembly: AssemblyFileVersion("0.1.0.0")] [assembly: AssemblyFileVersion("0.1.0.0")]

2
Properties/Resources.Designer.cs generated
View File

@ -89,7 +89,7 @@ namespace bzit.bomg.Properties {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to 0.3.0.030 beta. /// Looks up a localized string similar to 0.3.0.031 beta.
/// </summary> /// </summary>
internal static string app_version { internal static string app_version {
get { get {

2
Properties/Resources.resx
View File

@ -128,7 +128,7 @@
<value>Bookmark Manager</value> <value>Bookmark Manager</value>
</data> </data>
<data name="app_version" xml:space="preserve"> <data name="app_version" xml:space="preserve">
<value>0.3.0.030 beta</value> <value>0.3.0.031 beta</value>
</data> </data>
<data name="arrow_down_circle" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="arrow_down_circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\2\arrow-down-circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\2\arrow-down-circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

14
RyzStudio/Windows/Forms/ThreadControl.cs
View File

@ -508,6 +508,20 @@ namespace RyzStudio.Windows.Forms
} }
} }
public static void SetText(ThemedForms.TextBox control, string text)
{
if (control.InvokeRequired)
{
control.Invoke(new MethodInvoker(() => {
control.InnerTextBox.Text = text;
}));
}
else
{
control.InnerTextBox.Text = text;
}
}
public static void SetTopMost(Form control, bool value) public static void SetTopMost(Form control, bool value)
{ {
if (control.InvokeRequired) if (control.InvokeRequired)