From 8f3671693a681f74f9c121fff4d49c0c37915088 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <dimitri@stack.nl>
Date: Fri, 13 Sep 2013 15:42:42 +0200
Subject: Minor layout tweaks and extra guard
---
src/util.cpp | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/util.cpp b/src/util.cpp
index 83eb095..5abe4ed 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -4311,14 +4311,21 @@ bool getDefs(const QCString &scName,
{
//printf("multiple results; pick one from file:%s\n", currentFile->name().data());
md = members.first();
- while (md) {
- if (md->getFileDef()->name() == currentFile->name())
- break;
+ while (md)
+ {
+ if (md->getFileDef() && md->getFileDef()->name() == currentFile->name())
+ {
+ break; // found match in the current file
+ }
md=members.next();
}
- if (!md)
+ if (!md) // member not in the current file
+ {
md=members.last();
- } else {
+ }
+ }
+ else
+ {
md=members.last();
}
}
--
cgit v0.12