From ca865bc1f0f15f4b0b2baa324c841df7d20a47ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D0=B8=D1=80=20=D0=9D=D1=83=D0=B3=D0=B0?=
 =?UTF-8?q?=D0=B5=D0=B2?= <dnugaev344@gmail.com>
Date: Tue, 8 Nov 2022 12:21:37 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=BD=D1=8F=D1=82=D0=B0?=
 =?UTF-8?q?=D1=8F=204=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bus/Bus/DrawingBus.cs                    |  2 +-
 Bus/Bus/FormMapWithSetDoubleDeckerBus.cs | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Bus/Bus/DrawingBus.cs b/Bus/Bus/DrawingBus.cs
index f8924a1..4a13fe0 100644
--- a/Bus/Bus/DrawingBus.cs
+++ b/Bus/Bus/DrawingBus.cs
@@ -1,4 +1,4 @@
-using System;
+using Bus;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/Bus/Bus/FormMapWithSetDoubleDeckerBus.cs b/Bus/Bus/FormMapWithSetDoubleDeckerBus.cs
index 0150735..acc98b1 100644
--- a/Bus/Bus/FormMapWithSetDoubleDeckerBus.cs
+++ b/Bus/Bus/FormMapWithSetDoubleDeckerBus.cs
@@ -80,7 +80,7 @@ namespace Bus
 
         private void ButtonAddBus_Click(object sender, EventArgs e)
         {
-            if (_mapBusCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -94,11 +94,10 @@ namespace Bus
                 }
 
                 DrawingObjectBus bus = new(form.SelectedBus);
-
-                if (_mapBusCollectionGeneric + bus != -1)
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + bus != -1)
                 {
                     MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapBusCollectionGeneric.ShowSet();
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
                 }
                 else
                 {
@@ -109,20 +108,27 @@ namespace Bus
 
         private void ButtonRemoveBus_Click(object sender, EventArgs e)
         {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+
             if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
             {
                 return;
             }
+
             if (MessageBox.Show("Удалить объект?", "Удаление",
             MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
             {
                 return;
             }
+
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapBusCollectionGeneric - pos != null)
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapBusCollectionGeneric.ShowSet();
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
             }
             else
             {