tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #674 from Mbucari/master

Browse Source 
Fix #673
This commit is contained in:
Mbucari 2023-07-13 09:31:28 -06:00 committed by GitHub
commit 0c0c556c6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/LibationAvalonia/Controls/Settings/Important.axaml
View File

@ -97,7 +97,8 @@
<controls:GroupBox <controls:GroupBox
Grid.Row="2" Grid.Row="2"
Margin="5"> Margin="5"
Label="Display Settings">
<Grid <Grid
RowDefinitions="Auto,Auto" RowDefinitions="Auto,Auto"
ColumnDefinitions="Auto,Auto,*"> ColumnDefinitions="Auto,Auto,*">

9
Source/LibationAvalonia/Program.cs
View File

@ -36,6 +36,7 @@ namespace LibationAvalonia
} }
AppDomain.CurrentDomain.UnhandledException += (o, e) => LogError(e.ExceptionObject); AppDomain.CurrentDomain.UnhandledException += (o, e) => LogError(e.ExceptionObject);
bool loggingEnabled = false;
//***********************************************// //***********************************************//
// // // //
// do not use Configuration before this line // // do not use Configuration before this line //
@ -55,6 +56,7 @@ namespace LibationAvalonia
// most migrations go in here // most migrations go in here
LibationScaffolding.RunPostConfigMigrations(config); LibationScaffolding.RunPostConfigMigrations(config);
LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config); LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config);
loggingEnabled = true;
//Start loading the library before loading the main form //Start loading the library before loading the main form
App.LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true)); App.LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
@ -64,9 +66,12 @@ namespace LibationAvalonia
classicLifetimeTask.Result.Start(null); classicLifetimeTask.Result.Start(null);
} }
catch(Exception e) catch (Exception ex)
{ {
LogError(e); if (loggingEnabled)
Serilog.Log.Logger.Error(ex, "CRASH");
else
LogError(ex);
} }
} }

2
Source/LibationUiBase/GridView/LibraryBookEntry[TStatus].cs
View File

@ -54,6 +54,8 @@ namespace LibationUiBase.GridView
SynchronizationContext.SetSynchronizationContext(syncContext); SynchronizationContext.SetSynchronizationContext(syncContext);
int length = int.Min(numPer, products.Length - start); int length = int.Min(numPer, products.Length - start);
if (length < 1) return Array.Empty<IGridEntry>();
var result = new IGridEntry[length]; var result = new IGridEntry[length];
for (int j = 0; j < length; j++) for (int j = 0; j < length; j++)

1
Source/LibationUiBase/GridView/SeriesEntry[TStatus].cs
View File

@ -4,7 +4,6 @@ using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Channels;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace LibationUiBase.GridView namespace LibationUiBase.GridView