Skip to content

Commit

Permalink
Update ip released
Browse files Browse the repository at this point in the history
  • Loading branch information
MyLibh committed Oct 16, 2018
1 parent 7d06ecf commit 833d593
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 8 deletions.
2 changes: 1 addition & 1 deletion VS17/Client GUI/InitProgramForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions VS17/Client GUI/MainWindowForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion VS17/Client GUI/MainWindowForm.cs
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
using System;
using System.Windows.Forms;
using System.Net;
using System.IO;

using Client_GUI.MainWindowInputForms;

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();
}

Expand All @@ -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();
}
}
}
16 changes: 12 additions & 4 deletions VS17/Client GUI/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/Network/TCPConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 833d593

Please sign in to comment.