From 833d5937b2916549a785d634f35843c84d223486 Mon Sep 17 00:00:00 2001
From: Aleksei <gav503244@gmail.com>
Date: Wed, 17 Oct 2018 00:39:57 +0300
Subject: [PATCH] Update ip released

---
 VS17/Client GUI/InitProgramForm.Designer.cs |  2 +-
 VS17/Client GUI/MainWindowForm.Designer.cs  |  2 ++
 VS17/Client GUI/MainWindowForm.cs           | 14 +++++++++++++-
 VS17/Client GUI/Program.cs                  | 16 ++++++++++++----
 src/Network/TCPConnection.cpp               |  2 --
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/VS17/Client GUI/InitProgramForm.Designer.cs b/VS17/Client GUI/InitProgramForm.Designer.cs
index 9d3dd0f..8686e17 100644
--- a/VS17/Client GUI/InitProgramForm.Designer.cs	
+++ b/VS17/Client GUI/InitProgramForm.Designer.cs	
@@ -90,7 +90,7 @@ private void InitializeComponent()
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(404, 195);
+            this.ClientSize = new System.Drawing.Size(400, 195);
             this.Controls.Add(this.port_maskedTextBox);
             this.Controls.Add(this.ip_port_label);
             this.Controls.Add(this.confirm_button);
diff --git a/VS17/Client GUI/MainWindowForm.Designer.cs b/VS17/Client GUI/MainWindowForm.Designer.cs
index 182701e..bb751b8 100644
--- a/VS17/Client GUI/MainWindowForm.Designer.cs	
+++ b/VS17/Client GUI/MainWindowForm.Designer.cs	
@@ -100,6 +100,7 @@ private void InitializeComponent()
             // 
             // aboutToolStripMenuItem
             // 
+            this.aboutToolStripMenuItem.Enabled = false;
             this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
             this.aboutToolStripMenuItem.Size = new System.Drawing.Size(52, 20);
             this.aboutToolStripMenuItem.Text = "About";
@@ -299,6 +300,7 @@ private void InitializeComponent()
             this.updateIPToolStripMenuItem.Name = "updateIPToolStripMenuItem";
             this.updateIPToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.updateIPToolStripMenuItem.Text = "Update IP";
+            this.updateIPToolStripMenuItem.Click += new System.EventHandler(this.updateIPToolStripMenuItem_Click);
             // 
             // toolStripSeparator1
             // 
diff --git a/VS17/Client GUI/MainWindowForm.cs b/VS17/Client GUI/MainWindowForm.cs
index c1f76ab..4c25461 100644
--- a/VS17/Client GUI/MainWindowForm.cs	
+++ b/VS17/Client GUI/MainWindowForm.cs	
@@ -1,6 +1,7 @@
 using System;
 using System.Windows.Forms;
 using System.Net;
+using System.IO;
 
 using Client_GUI.MainWindowInputForms;
 
@@ -8,12 +9,15 @@ namespace Client_GUI
 {
     public partial class MainWindowForm : Form
     {
+        public bool reinit { get; set; }
+
         NativeClient.NativeMethods m_client;
 
         public MainWindowForm(IPEndPoint endpoint)
         {       
             m_client = new NativeClient.NativeMethods(endpoint);
-          
+            reinit = false;
+
             InitializeComponent();
         }
 
@@ -34,5 +38,13 @@ private void exitToolStripMenuItem_Click(object sender, EventArgs e)
         {
             this.Close();
         }
+
+        private void updateIPToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            File.Delete("Connection.properties");
+            this.reinit = true;
+
+            this.Close();
+        }
     }
 }
diff --git a/VS17/Client GUI/Program.cs b/VS17/Client GUI/Program.cs
index 6e2bc56..7ae2e56 100644
--- a/VS17/Client GUI/Program.cs	
+++ b/VS17/Client GUI/Program.cs	
@@ -14,11 +14,19 @@ static void Main()
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
-            InitProgramForm initProgramForm = new InitProgramForm();
-            Application.Run(initProgramForm);
+            MainWindowForm mainWindowForm;
+            while (true)
+            { 
+                InitProgramForm initProgramForm = new InitProgramForm();
+                Application.Run(initProgramForm);
+
+                mainWindowForm = new MainWindowForm(initProgramForm.endpoint);
+                Application.Run(mainWindowForm);
+                if (!mainWindowForm.reinit)
+                    break;       
+            }
+
 
-            MainWindowForm mainWindowForm = new MainWindowForm(initProgramForm.endpoint);
-            Application.Run(mainWindowForm);
             mainWindowForm.Dispose();
         }
     }
diff --git a/src/Network/TCPConnection.cpp b/src/Network/TCPConnection.cpp
index 317015d..2f4a531 100644
--- a/src/Network/TCPConnection.cpp
+++ b/src/Network/TCPConnection.cpp
@@ -90,8 +90,6 @@ void TCPConnection::write()
 			{
 				if (!ec)
 				{
-					std::cout << "'" << m_write_msgs.front()->get_data() << "'\n";
-
 					m_write_msgs.pop_front();
 					if (!m_write_msgs.empty())
 						write();