diff options
| author | 2021-02-20 21:15:00 -0800 | |
|---|---|---|
| committer | 2021-02-20 21:15:00 -0800 | |
| commit | 3d0394681c07fddc48cdee956329db89254b763d (patch) | |
| tree | 15e4fc8fb15f1d574063d89649c62bda74ac02b2 /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #5965 from Morph1984/shader-count (diff) | |
| parent | kernel: Fix resource release exception on exit (diff) | |
| download | yuzu-3d0394681c07fddc48cdee956329db89254b763d.tar.gz yuzu-3d0394681c07fddc48cdee956329db89254b763d.tar.xz yuzu-3d0394681c07fddc48cdee956329db89254b763d.zip | |
Merge pull request #5971 from ameerj/reslimit-dtor
kernel: Fix resource release exception on exit
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index b6e6f115e..39c5182c5 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -101,8 +101,6 @@ struct KernelCore::Impl { | |||
| 101 | 101 | ||
| 102 | current_process = nullptr; | 102 | current_process = nullptr; |
| 103 | 103 | ||
| 104 | system_resource_limit = nullptr; | ||
| 105 | |||
| 106 | global_handle_table.Clear(); | 104 | global_handle_table.Clear(); |
| 107 | 105 | ||
| 108 | preemption_event = nullptr; | 106 | preemption_event = nullptr; |
| @@ -111,6 +109,13 @@ struct KernelCore::Impl { | |||
| 111 | 109 | ||
| 112 | exclusive_monitor.reset(); | 110 | exclusive_monitor.reset(); |
| 113 | 111 | ||
| 112 | hid_shared_mem = nullptr; | ||
| 113 | font_shared_mem = nullptr; | ||
| 114 | irs_shared_mem = nullptr; | ||
| 115 | time_shared_mem = nullptr; | ||
| 116 | |||
| 117 | system_resource_limit = nullptr; | ||
| 118 | |||
| 114 | // Next host thead ID to use, 0-3 IDs represent core threads, >3 represent others | 119 | // Next host thead ID to use, 0-3 IDs represent core threads, >3 represent others |
| 115 | next_host_thread_id = Core::Hardware::NUM_CPU_CORES; | 120 | next_host_thread_id = Core::Hardware::NUM_CPU_CORES; |
| 116 | } | 121 | } |