mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-05-27 09:47:09 +08:00
Merge remote-tracking branch 'origin/GP-1_ghidragon_fixed_minor_bookmark_cache_bug'
This commit is contained in:
+3
-2
@@ -4,9 +4,9 @@
|
|||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
* You may obtain a copy of the License at
|
* You may obtain a copy of the License at
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
@@ -92,6 +92,7 @@ class BookmarkTableModel extends AddressBasedTableModel<BookmarkRowObject> {
|
|||||||
@Override
|
@Override
|
||||||
protected void doLoad(Accumulator<BookmarkRowObject> accumulator, TaskMonitor monitor)
|
protected void doLoad(Accumulator<BookmarkRowObject> accumulator, TaskMonitor monitor)
|
||||||
throws CancelledException {
|
throws CancelledException {
|
||||||
|
lastBookmark = null;
|
||||||
LongIterator it = LongIterator.EMPTY;
|
LongIterator it = LongIterator.EMPTY;
|
||||||
if (bookmarkMgr != null && !types.isEmpty()) {
|
if (bookmarkMgr != null && !types.isEmpty()) {
|
||||||
it = new BookmarkKeyIterator(bookmarkMgr);
|
it = new BookmarkKeyIterator(bookmarkMgr);
|
||||||
|
|||||||
Reference in New Issue
Block a user