X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmemory%2FMemoryTableContentProvider.java;h=a27f31f33ae02381b37ffb7193f6f2a51a946102;hb=2d1f3e4780616f3b638133a243fcdb7a6738baf9;hp=90ad7885c172640b26e70f24022730685868d5c2;hpb=76c2b3eab6cec47490bb75713356152deb5d07ed;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java
index 90ad7885..a27f31f3 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java
@@ -27,12 +27,13 @@ public class MemoryTableContentProvider implements ILazyContentProvider, MemoryC
 
 	public void updateItemCount()
 	{
-		if (memory != null)
-		{
-			long size = memory.getDefinition().getMaximalAddress() - lower;
-			viewer.setItemCount(size > amount ? amount : (int) size);
-		} else
-			viewer.setItemCount(0);
+		if (viewer != null)
+			if (memory != null)
+			{
+				long size = memory.getDefinition().getMaximalAddress() - lower;
+				viewer.setItemCount(size > amount ? amount : (int) size);
+			} else
+				viewer.setItemCount(0);
 	}
 
 	public long getLowerBound()
@@ -54,9 +55,12 @@ public class MemoryTableContentProvider implements ILazyContentProvider, MemoryC
 	@Override
 	public void updateElement(int index)
 	{
-		long address = lower + index;
-		if (address <= memory.getDefinition().getMaximalAddress())
-			viewer.replace(new MemoryTableRow(address, memory), index);
+		if (index < amount)
+		{
+			long address = lower + index;
+			if (address <= memory.getDefinition().getMaximalAddress())
+				viewer.replace(new MemoryTableRow(address, memory), index);
+		}
 	}
 
 	@Override