GabrielTofvesson/BankProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

* Fixed error where release build of server would crash if closed by built in close button

Browse Source 
* Fixed empty listview crash in SessionContext
This commit is contained in:
Gabriel Tofvesson 2018-05-16 20:26:39 +02:00
parent a5d50c619a
commit 35d61d9d91
3 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Client/Context/SessionContext.cs
View File

@ -398,21 +398,25 @@ namespace Client
{ {
//var list = GetView<ListView>("account_show"); //var list = GetView<ListView>("account_show");
var list = new ListView(new ViewData("ListView").SetAttribute("padding_left", 2).SetAttribute("padding_right", 2).SetAttribute("border", 8), LangManager.NO_LANG); var list = new ListView(new ViewData("ListView").SetAttribute("padding_left", 2).SetAttribute("padding_right", 2).SetAttribute("border", 8), LangManager.NO_LANG);
if (data.Length == 1 && data[0].Length == 0) return list; //if (data.Length == 1 && data[0].Length == 0) data = new string[0];
bool b = data.Length == 1 && data[0].Length == 0; Tuple<string, View>[] listData = new Tuple<string, View>[data.Length - ((data.Length == 1 && data[0].Length == 0) ? 1 : 0)];
Tuple<string, View>[] listData = new Tuple<string, View>[data.Length - (b ? 1 : 0)]; for (int i = 0; i < listData.Length; ++i)
if (!b) {
for (int i = 0; i < listData.Length; ++i) ButtonView t = new ButtonView(new ViewData("ButtonView").AddNestedSimple("Text", data[i]), LangManager.NO_LANG); // Don't do translations
t.SetEvent(v =>
{ {
ButtonView t = new ButtonView(new ViewData("ButtonView").AddNestedSimple("Text", data[i]), LangManager.NO_LANG); // Don't do translations onclick?.Invoke(v);
t.SetEvent(v => if (exitOnSubmit) Hide(list);
{ });
onclick?.Invoke(v); listData[i] = new Tuple<string, View>(t.Text, t);
if (exitOnSubmit) Hide(list); }
}); if (listData.Length > 0) list.AddViews(0, listData);
listData[i] = new Tuple<string, View>(t.Text, t); else
} {
list.AddViews(0, listData); // Insert generated buttons before predefined "close" button ButtonView close = new ButtonView(new ViewData("ButtonView").AddNestedSimple("Text", GetIntlString("GENERIC_dismiss")), LangManager.NO_LANG);
close.SetEvent(_ => Hide(list));
list.AddView(close, "close");
}
if (hideOnBack) list.OnBackEvent = v => Hide(v); if (hideOnBack) list.OnBackEvent = v => Hide(v);
return list; return list;
} }

11
Server/Output.cs
View File

@ -67,6 +67,8 @@ namespace Server
if (newline) if (newline)
{ {
writer.WriteLine(); writer.WriteLine();
Console.ForegroundColor = f1;
Console.BackgroundColor = b1;
readStart_x = 0; readStart_x = 0;
++readStart_y; ++readStart_y;
OnNewLine?.Invoke(); OnNewLine?.Invoke();
@ -74,9 +76,12 @@ namespace Server
readStart_x = (short)Console.CursorLeft; readStart_x = (short)Console.CursorLeft;
if (reading) Console.Out.Write(read); if (reading) Console.Out.Write(read);
} }
else readStart_x = (short)Console.CursorLeft; else
Console.ForegroundColor = f1; {
Console.BackgroundColor = b1; readStart_x = (short)Console.CursorLeft;
Console.ForegroundColor = f1;
Console.BackgroundColor = b1;
}
} }
} }

9
Server/Program.cs
View File

@ -25,15 +25,16 @@ Use command 'help' to get a list of available commands";
private const string VERBOSE_RESPONSE = "@string/REMOTE_"; private const string VERBOSE_RESPONSE = "@string/REMOTE_";
public static int verbosity = 2; public static int verbosity = 2;
const decimal ratePerDay = 0.5M; // Savings account has a growth rate of 150% per day const decimal ratePerDay = 0.5M; // Savings account has a growth rate of 150% per day
// Initialize the database
public static readonly Database db = new Database("BankDB", "Resources");
public static void Main(string[] args) public static void Main(string[] args)
{ {
// Create a client session manager and allow sessions to remain valid for up to 5 minutes of inactivity (300 seconds) // Create a client session manager and allow sessions to remain valid for up to 5 minutes of inactivity (300 seconds)
SessionManager manager = new SessionManager(300 * TimeSpan.TicksPerSecond, 20); SessionManager manager = new SessionManager(300 * TimeSpan.TicksPerSecond, 20);
// Initialize the database
Database db = new Database("BankDB", "Resources");
SetConsoleCtrlHandler(i => { SetConsoleCtrlHandler(i => {
if (i == 2) db.Flush(); // Ensures that the database is flushed before the program exits db.Flush(); // Ensures that the database is flushed before the program exits
return false; return false;
}, true); }, true);
@ -547,7 +548,7 @@ Use command 'help' to get a list of available commands";
// Handles unexpected console close events (kernel event hook for window close event) // Handles unexpected console close events (kernel event hook for window close event)
private delegate bool EventHandler(int eventType); private delegate bool EventHandler(int eventType);
[DllImport("kernel32.dll")] [DllImport("Kernel32.dll", SetLastError = true)]
private static extern bool SetConsoleCtrlHandler(EventHandler callback, bool add); private static extern bool SetConsoleCtrlHandler(EventHandler callback, bool add);
} }
} }