Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

This commit is contained in:
staccatomamba
2016-09-16 15:28:04 +02:00

View File

@@ -35,6 +35,7 @@ using System.Collections;
using System.Drawing;
using System.IO;
using System.Net;
using System.Net.NetworkInformation;
using System.Text;
using System.Windows.Forms;
using BS.Shared.Core;
@@ -1412,7 +1413,7 @@ namespace BeWo.View
{
NetworkStream serverStream = s.GetStream();
String abc = "";
String abc = NetworkInterface.GetAllNetworkInterfaces().Where(inc => inc.OperationalStatus == OperationalStatus.Up).Select(inc => inc.GetPhysicalAddress().ToString()).FirstOrDefault();
Packet a = new Packet();
@@ -1748,8 +1749,7 @@ namespace BeWo.View
(ThreadStart)delegate
{
chatView.Chatbox.Focus();
chatView.Chatbox.Text += " " + Emojicode ;
//chatView.Chatbox.Controls.Add(pic);
chatView.Chatbox.Text += " " + Emojicode;
chatView.Chatbox.SelectionStart = chatView.Chatbox.Text.Length;
});
}