Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController
# Conflicts: # PolyChat/Controller.cs
This commit is contained in:
@@ -28,8 +28,6 @@ namespace PolyChat
|
||||
private readonly FileManager fileManager;
|
||||
// Props
|
||||
private Dictionary<string, Connection> Connections = new Dictionary<string, Connection>();
|
||||
private string OwnName = "";
|
||||
private string OwnIP;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes Controller with UI access
|
||||
@@ -39,7 +37,7 @@ namespace PolyChat
|
||||
{
|
||||
UIController = uiController;
|
||||
fileManager = new FileManager(this);
|
||||
OwnIP = getIP();
|
||||
//OwnIP = getIP();
|
||||
fileManager.loadChats();
|
||||
Serve();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user