Merge branch ryujinx:master into master
commit
1c3ed0d168
|
|
@ -889,7 +889,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
|
||||||
[Svc(1)]
|
[Svc(1)]
|
||||||
public Result SetHeapSize([PointerSized] out ulong address, [PointerSized] ulong size)
|
public Result SetHeapSize([PointerSized] out ulong address, [PointerSized] ulong size)
|
||||||
{
|
{
|
||||||
if ((size & 0xfffffffd001fffff) != 0)
|
if ((size & 0xfffffffc001fffff) != 0)
|
||||||
{
|
{
|
||||||
address = 0;
|
address = 0;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -176,7 +176,8 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||||
.Sort(GetComparer())
|
.Sort(GetComparer())
|
||||||
.OnItemAdded(_ => OnPropertyChanged(nameof(AppsObservableList)))
|
.OnItemAdded(_ => OnPropertyChanged(nameof(AppsObservableList)))
|
||||||
.OnItemRemoved(_ => OnPropertyChanged(nameof(AppsObservableList)))
|
.OnItemRemoved(_ => OnPropertyChanged(nameof(AppsObservableList)))
|
||||||
.Bind(out _appsObservableList);
|
.Bind(out _appsObservableList)
|
||||||
|
.Subscribe();
|
||||||
|
|
||||||
_rendererWaitEvent = new AutoResetEvent(false);
|
_rendererWaitEvent = new AutoResetEvent(false);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue