Skip to content
Snippets Groups Projects
Commit c6c5661f authored by psainvit's avatar psainvit
Browse files

TSU-4049 part 2

parent 48b7e571
Branches master
Tags 2.01.03
1 merge request!1124TSU-4049
Pipeline #9594606 waiting for manual action
......@@ -458,11 +458,9 @@ namespace TSU.Common
if (incomingTsunami.Version == null)
incomingTsunami.Version = R.T_PRE_1_0_XX;
if (incomingTsunami.Version == currentTsunami.Version)
{
currentTsunami.PathOfTheSavedFile = incomingTsunami.PathOfTheSavedFile;
}
else
if (incomingTsunami.Version != currentTsunami.Version)
{
string backUpPath = TSU.IO.Backup.Create(incomingTsunami.PathOfTheSavedFile, $"version {incomingTsunami.Version}", keepOriginalPlace: true);
......@@ -486,6 +484,7 @@ namespace TSU.Common
currentTsunami.Points = incomingTsunami.Points;
currentTsunami.CompositeElements = incomingTsunami.CompositeElements;
currentTsunami.HiddenPoints = incomingTsunami.HiddenPoints;
foreach (M.Module item in incomingTsunami.MeasurementModules)
{
Tsunami2.Properties.Menu.BroadcastMessage($"Restarting {item._Name}");
......
......
......@@ -208,7 +208,7 @@ namespace TSU.Common
this.menu.OpenExistingModules(file);
});
}
if (ext == ".INP" || ext == ".LGC")
else if (ext == ".INP" || ext == ".LGC")
{
RunInADifferentThreadToReleaseTheExplorerWindows(() =>
{
......@@ -217,7 +217,7 @@ namespace TSU.Common
}
else
{
new MessageInput(MessageType.Warning, "Only support '*.TSU' file for the moment").Show();
new MessageInput(MessageType.Warning, "Only support '*.TSU; *.LGC; *.INP' file for the moment").Show();
}
}
}
......
......
......@@ -308,7 +308,7 @@ namespace TSU.Polar
// Retrieve the node that was dragged.
TreeNode draggedNode = (TsuNode)e.Data.GetData(typeof(TsuNode));
if (targetNode != null)
if (targetNode != null && draggedNode != null)
{
seperatorLine.Height = 3;
seperatorLine.Left = targetNode.Bounds.Left;
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment