X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java
index 8a1b7f8..5da692e 100644
--- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java
+++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java
@@ -49,7 +49,14 @@ public class XDebugVariable extends XDebugElement implements IVariable {
 		String name = PHPDebugUtils.getAttributeValue (property, "name"); // Get the name of the variable (XDebug submits the name without the '$' prefix)
 
 		if (fParent == null) {
-		    fName = "$" + name;                                           // Prepend the variable 'short' name with the php variable prefix '$'
+			if (!name.isEmpty ()) {										  // If we have a name
+				if (name.charAt(0) == '$') {							  // If variable name has already a '$' in front (newer version of XDebug) 
+					fName = name;                                         // take the name as is
+				}
+				else {
+					fName = "$" + name;                                   // if not, prepend the variable 'short' name with the php variable prefix '$'
+				}
+			}
 		}
 		else {
 		    if (fParent.isArray ()) {
@@ -167,6 +174,7 @@ public class XDebugVariable extends XDebugElement implements IVariable {
 	 * @see org.eclipse.debug.core.model.IValueModification#setValue(org.eclipse.debug.core.model.IValue)
 	 */
 	public void setValue(IValue value) throws DebugException {
+		fValue = (XDebugAbstractValue) value;
 	}
 
 	/**