Skip to content
This repository was archived by the owner on Aug 23, 2025. It is now read-only.

Commit a5acfd4

Browse files
committed
Merge branch 'v1.4.3-import-bugfix' into vNext
2 parents 05b77cc + 91438e9 commit a5acfd4

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

86BoxManager/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following
@@ -10,7 +9,7 @@
109
[assembly: AssemblyConfiguration("")]
1110
[assembly: AssemblyCompany("David Simunič and others")]
1211
[assembly: AssemblyProduct("86Box Manager")]
13-
[assembly: AssemblyCopyright("Copyright © 2018 David Simunič and others")]
12+
[assembly: AssemblyCopyright("Copyright © 2018-2019 David Simunič")]
1413
[assembly: AssemblyTrademark("")]
1514
[assembly: AssemblyCulture("")]
1615

@@ -32,5 +31,5 @@
3231
// You can specify all the values or you can default the Build and Revision Numbers
3332
// by using the '*' as shown below:
3433

35-
[assembly: AssemblyVersion("1.4.0.0")]
36-
[assembly: AssemblyFileVersion("1.4.0.0")]
34+
[assembly: AssemblyVersion("1.4.3.0")]
35+
[assembly: AssemblyFileVersion("1.4.3.0")]

86BoxManager/frmMain.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1346,7 +1346,7 @@ public void VMImport(string name, string desc, string importPath, bool openCFG,
13461346

13471347
if (importFailed)
13481348
{
1349-
MessageBox.Show("Virtual machine \"" + newVM.Name + "\" was successfully created, but files could not be imported. Make sure the path you selected was correct and valid.", "Import failed", MessageBoxButtons.OK, MessageBoxIcon.Warning);
1349+
MessageBox.Show("Virtual machine \"" + newVM.Name + "\" was successfully created, but files could not be imported. Make sure the path you selected was correct and valid.\n\nIf the VM is already located in your VMs folder, you don't need to select the Import option, just add a new VM with the same name.", "Import failed", MessageBoxButtons.OK, MessageBoxIcon.Warning);
13501350
}
13511351
else
13521352
{

0 commit comments

Comments
 (0)